clean up a merge conflict and remove a console message
clean up a merge conflict and remove a console message



BogusCurry/arribasim-dev,ft-/opensim-optimizations-wip-tests,AlexRa/opensim-mods-Alex,intari/OpenSimMirror,justinccdev/opensim,justinccdev/opensim,intari/OpenSimMirror,intari/OpenSimMirror,justinccdev/opensim,EriHoss/OpenSim_0.8.2.0_Dev_LibLSLCC,AlphaStaxLLC/taiga,QuillLittlefeather/opensim-1,rryk/omp-server,cdbean/CySim,zekizeki/agentservice,ft-/opensim-optimizations-wip-extras,bravelittlescientist/opensim-performance,zekizeki/agentservice,ft-/opensim-optimizations-wip-extras,ft-/arribasim-dev-extras,M-O-S-E-S/opensim,AlphaStaxLLC/taiga,TomDataworks/opensim,Michelle-Argus/ArribasimExtract,ft-/arribasim-dev-tests,EriHoss/OpenSim_0.8.2.0_Dev_LibLSLCC,ft-/arribasim-dev-tests,ft-/arribasim-dev-tests,ft-/opensim-optimizations-wip-extras,ft-/arribasim-dev-tests,allquixotic/opensim-autobackup,zekizeki/agentservice,TechplexEngineer/Aurora-Sim,ft-/opensim-optimizations-wip-extras,QuillLittlefeather/opensim-1,M-O-S-E-S/opensim,AlphaStaxLLC/taiga,Michelle-Argus/ArribasimExtract,M-O-S-E-S/opensim,TechplexEngineer/Aurora-Sim,RavenB/opensim,N3X15/VoxelSim,BogusCurry/arribasim-dev,allquixotic/opensim-autobackup,EriHoss/OpenSim_0.8.2.0_Dev_LibLSLCC,rryk/omp-server,RavenB/opensim,EriHoss/OpenSim_0.8.2.0_Dev_LibLSLCC,rryk/omp-server,bravelittlescientist/opensim-performance,cdbean/CySim,TomDataworks/opensim,zekizeki/agentservice,ft-/opensim-optimizations-wip,EriHoss/OpenSim_0.8.2.0_Dev_LibLSLCC,ft-/opensim-optimizations-wip-tests,RavenB/opensim,ft-/arribasim-dev-extras,AlphaStaxLLC/taiga,ft-/opensim-optimizations-wip-tests,TomDataworks/opensim,AlphaStaxLLC/taiga,TomDataworks/opensim,rryk/omp-server,AlphaStaxLLC/taiga,N3X15/VoxelSim,bravelittlescientist/opensim-performance,M-O-S-E-S/opensim,ft-/arribasim-dev-extras,bravelittlescientist/opensim-performance,cdbean/CySim,Michelle-Argus/ArribasimExtract,BogusCurry/arribasim-dev,ft-/opensim-optimizations-wip,OpenSimian/opensimulator,TomDataworks/opensim,EriHoss/OpenSim_0.8.2.0_Dev_LibLSLCC,RavenB/opensim,QuillLittlefeather/opensim-1,TechplexEngineer/Aurora-Sim,TomDataworks/opensim,rryk/omp-server,RavenB/opensim,AlphaStaxLLC/taiga,N3X15/VoxelSim,BogusCurry/arribasim-dev,OpenSimian/opensimulator,OpenSimian/opensimulator,zekizeki/agentservice,RavenB/opensim,cdbean/CySim,N3X15/VoxelSim,rryk/omp-server,N3X15/VoxelSim,OpenSimian/opensimulator,bravelittlescientist/opensim-performance,AlexRa/opensim-mods-Alex,ft-/arribasim-dev-extras,ft-/arribasim-dev-tests,AlphaStaxLLC/taiga,cdbean/CySim,M-O-S-E-S/opensim,AlexRa/opensim-mods-Alex,RavenB/opensim,ft-/opensim-optimizations-wip-extras,OpenSimian/opensimulator,M-O-S-E-S/opensim,allquixotic/opensim-autobackup,M-O-S-E-S/opensim,AlexRa/opensim-mods-Alex,intari/OpenSimMirror,EriHoss/OpenSim_0.8.2.0_Dev_LibLSLCC,ft-/opensim-optimizations-wip-tests,ft-/opensim-optimizations-wip,N3X15/VoxelSim,AlexRa/opensim-mods-Alex,QuillLittlefeather/opensim-1,ft-/opensim-optimizations-wip-tests,zekizeki/agentservice,Michelle-Argus/ArribasimExtract,allquixotic/opensim-autobackup,N3X15/VoxelSim,ft-/arribasim-dev-extras,BogusCurry/arribasim-dev,BogusCurry/arribasim-dev,bravelittlescientist/opensim-performance,allquixotic/opensim-autobackup,Michelle-Argus/ArribasimExtract,allquixotic/opensim-autobackup,intari/OpenSimMirror,N3X15/VoxelSim,OpenSimian/opensimulator,justinccdev/opensim,intari/OpenSimMirror,ft-/arribasim-dev-tests,OpenSimian/opensimulator,QuillLittlefeather/opensim-1,justinccdev/opensim,ft-/opensim-optimizations-wip,ft-/arribasim-dev-extras,TechplexEngineer/Aurora-Sim,AlexRa/opensim-mods-Alex,Michelle-Argus/ArribasimExtract,QuillLittlefeather/opensim-1,cdbean/CySim,QuillLittlefeather/opensim-1,justinccdev/opensim,TomDataworks/opensim