Fixed prebuild errors that have emerged with the merge
Fixed prebuild errors that have emerged with the merge

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