Fix some merge issues and a functional issue in the scene manager

author: Melanie 2012-07-28 01:06:28 +0100
committer: Melanie 2012-07-28 01:06:28 +0100
commit: 45b72bf01c99697e65b6cda5515bbadc4a9442da (patch)
tree: 80d6d65917c2c26b2dce46755acefc25109df129 /prebuild.xml
parent: Add master's new binaries (diff)
download: opensim-SC_OLD-45b72bf01c99697e65b6cda5515bbadc4a9442da.zip
opensim-SC_OLD-45b72bf01c99697e65b6cda5515bbadc4a9442da.tar.gz
opensim-SC_OLD-45b72bf01c99697e65b6cda5515bbadc4a9442da.tar.bz2
opensim-SC_OLD-45b72bf01c99697e65b6cda5515bbadc4a9442da.tar.xz
1 files changed, 2 insertions, 39 deletions
diff --git a/prebuild.xml b/prebuild.xml
index 469ca99..1b599a9 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -112,10 +112,7 @@
      </Files>
    </Project>
-<<<<<<< HEAD:prebuild.xml
+    <Project frameworkVersion="v4_0" name="OpenSim.Framework.Monitoring" path="OpenSim/Framework/Monitoring" type="Library">
-    <Project frameworkVersion="v4_0" name="OpenSim.Framework.Servers.HttpServer" path="OpenSim/Framework/Servers/HttpServer" type="Library">
-=======
-    <Project frameworkVersion="v3_5" name="OpenSim.Framework.Monitoring" path="OpenSim/Framework/Monitoring" type="Library">
      <Configuration name="Debug">
        <Options>
          <OutputPath>../../../bin/</OutputPath>
@@ -141,8 +138,7 @@
      </Files>
    </Project>
-    <Project frameworkVersion="v3_5" name="OpenSim.Framework.Servers.HttpServer" path="OpenSim/Framework/Servers/HttpServer" type="Library">
+    <Project frameworkVersion="v4_0" name="OpenSim.Framework.Servers.HttpServer" path="OpenSim/Framework/Servers/HttpServer" type="Library">
->>>>>>> master:prebuild.xml
      <Configuration name="Debug">
        <Options>
          <OutputPath>../../../../bin/</OutputPath>
@@ -266,35 +262,7 @@
      </Files>
    </Project>
-<<<<<<< HEAD:prebuild.xml
-    <Project frameworkVersion="v4_0" name="OpenSim.Framework.Statistics" path="OpenSim/Framework/Statistics" type="Library">
-      <Configuration name="Debug">
-        <Options>
-          <OutputPath>../../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <Configuration name="Release">
-        <Options>
-          <OutputPath>../../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <ReferencePath>../../../bin/</ReferencePath>
-      <Reference name="System"/>
-      <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
-      <Reference name="OpenMetaverse" path="../../../bin/"/>
-      <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/>
-      <Reference name="OpenSim.Framework"/>
-      <Files>
-        <Match pattern="*.cs" recurse="true"/>
-      </Files>
-    </Project>
    <Project frameworkVersion="v4_0" name="OpenSim.Data" path="OpenSim/Data" type="Library">
-=======
-    <Project frameworkVersion="v3_5" name="OpenSim.Data" path="OpenSim/Data" type="Library">
->>>>>>> master:prebuild.xml
      <Configuration name="Debug">
        <Options>
          <OutputPath>../../bin/</OutputPath>
@@ -2565,12 +2533,7 @@
      </Files>
    </Project>
-<<<<<<< HEAD:prebuild.xml
    <Project frameworkVersion="v4_0" name="OpenSim.Region.UserStatistics" path="OpenSim/Region/UserStatistics" type="Library">
-=======
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.UserStatistics" path="OpenSim/Region/UserStatistics" type="Library">
->>>>>>> master:prebuild.xml
      <Configuration name="Debug">
        <Options>
          <OutputPath>../../../bin/</OutputPath>
author	Melanie	2012-07-28 01:06:28 +0100
committer	Melanie	2012-07-28 01:06:28 +0100
commit	45b72bf01c99697e65b6cda5515bbadc4a9442da (patch)
tree	80d6d65917c2c26b2dce46755acefc25109df129 /prebuild.xml
parent	Add master's new binaries (diff)
download	opensim-SC_OLD-45b72bf01c99697e65b6cda5515bbadc4a9442da.zip opensim-SC_OLD-45b72bf01c99697e65b6cda5515bbadc4a9442da.tar.gz opensim-SC_OLD-45b72bf01c99697e65b6cda5515bbadc4a9442da.tar.bz2 opensim-SC_OLD-45b72bf01c99697e65b6cda5515bbadc4a9442da.tar.xz

diff --git a/prebuild.xml b/prebuild.xml index 469ca99..1b599a9 100644 --- a/prebuild.xml +++ b/prebuild.xml
@@ -112,10 +112,7 @@
112	</Files>	112	</Files>
113	</Project>	113	</Project>
114		114
115	<<<<<<< HEAD:prebuild.xml	115	<Project frameworkVersion="v4_0" name="OpenSim.Framework.Monitoring" path="OpenSim/Framework/Monitoring" type="Library">
116	<Project frameworkVersion="v4_0" name="OpenSim.Framework.Servers.HttpServer" path="OpenSim/Framework/Servers/HttpServer" type="Library">
117	=======
118	<Project frameworkVersion="v3_5" name="OpenSim.Framework.Monitoring" path="OpenSim/Framework/Monitoring" type="Library">
119	<Configuration name="Debug">	116	<Configuration name="Debug">
120	<Options>	117	<Options>
121	<OutputPath>../../../bin/</OutputPath>	118	<OutputPath>../../../bin/</OutputPath>
@@ -141,8 +138,7 @@
141	</Files>	138	</Files>
142	</Project>	139	</Project>
143		140
144	<Project frameworkVersion="v3_5" name="OpenSim.Framework.Servers.HttpServer" path="OpenSim/Framework/Servers/HttpServer" type="Library">	141	<Project frameworkVersion="v4_0" name="OpenSim.Framework.Servers.HttpServer" path="OpenSim/Framework/Servers/HttpServer" type="Library">
145	>>>>>>> master:prebuild.xml
146	<Configuration name="Debug">	142	<Configuration name="Debug">
147	<Options>	143	<Options>
148	<OutputPath>../../../../bin/</OutputPath>	144	<OutputPath>../../../../bin/</OutputPath>
@@ -266,35 +262,7 @@
266	</Files>	262	</Files>
267	</Project>	263	</Project>
268		264
269	<<<<<<< HEAD:prebuild.xml
270	<Project frameworkVersion="v4_0" name="OpenSim.Framework.Statistics" path="OpenSim/Framework/Statistics" type="Library">
271	<Configuration name="Debug">
272	<Options>
273	<OutputPath>../../../bin/</OutputPath>
274	</Options>
275	</Configuration>
276	<Configuration name="Release">
277	<Options>
278	<OutputPath>../../../bin/</OutputPath>
279	</Options>
280	</Configuration>
281
282	<ReferencePath>../../../bin/</ReferencePath>
283	<Reference name="System"/>
284	<Reference name="OpenMetaverseTypes" path="../../../bin/"/>
285	<Reference name="OpenMetaverse" path="../../../bin/"/>
286	<Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/>
287	<Reference name="OpenSim.Framework"/>
288
289	<Files>
290	<Match pattern="*.cs" recurse="true"/>
291	</Files>
292	</Project>
293
294	<Project frameworkVersion="v4_0" name="OpenSim.Data" path="OpenSim/Data" type="Library">	265	<Project frameworkVersion="v4_0" name="OpenSim.Data" path="OpenSim/Data" type="Library">
295	=======
296	<Project frameworkVersion="v3_5" name="OpenSim.Data" path="OpenSim/Data" type="Library">
297	>>>>>>> master:prebuild.xml
298	<Configuration name="Debug">	266	<Configuration name="Debug">
299	<Options>	267	<Options>
300	<OutputPath>../../bin/</OutputPath>	268	<OutputPath>../../bin/</OutputPath>
@@ -2565,12 +2533,7 @@
2565	</Files>	2533	</Files>
2566	</Project>	2534	</Project>
2567		2535
2568	<<<<<<< HEAD:prebuild.xml
2569
2570	<Project frameworkVersion="v4_0" name="OpenSim.Region.UserStatistics" path="OpenSim/Region/UserStatistics" type="Library">	2536	<Project frameworkVersion="v4_0" name="OpenSim.Region.UserStatistics" path="OpenSim/Region/UserStatistics" type="Library">
2571	=======
2572	<Project frameworkVersion="v3_5" name="OpenSim.Region.UserStatistics" path="OpenSim/Region/UserStatistics" type="Library">
2573	>>>>>>> master:prebuild.xml
2574	<Configuration name="Debug">	2537	<Configuration name="Debug">
2575	<Options>	2538	<Options>
2576	<OutputPath>../../../bin/</OutputPath>	2539	<OutputPath>../../../bin/</OutputPath>