Merge branch 'master' into vehicles

author: Melanie 2009-10-27 11:32:11 +0000
committer: Melanie 2009-10-27 11:32:11 +0000
commit: 31a848e97bd984ab0a85feca397ce419f6ae839a (patch)
tree: 4743f5eb7c12b3723ed4b986d19714d1b3a0a3ea /prebuild.xml
parent: Commented out instrumentation in ODEPrim.cs (diff)
parent: Finally hunted down the Parallel deadlock. Packets were being handled asynchr... (diff)
download: opensim-SC-31a848e97bd984ab0a85feca397ce419f6ae839a.zip
opensim-SC-31a848e97bd984ab0a85feca397ce419f6ae839a.tar.gz
opensim-SC-31a848e97bd984ab0a85feca397ce419f6ae839a.tar.bz2
opensim-SC-31a848e97bd984ab0a85feca397ce419f6ae839a.tar.xz
1 files changed, 34 insertions, 1 deletions
diff --git a/prebuild.xml b/prebuild.xml
index 81f907d..12e33e9 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -588,6 +588,7 @@
      <ReferencePath>../../../../bin/</ReferencePath>
      <Reference name="System"/>
      <Reference name="System.Drawing"/>
+      <Reference name="CSJ2K.dll"/>
      <Reference name="OpenMetaverseTypes.dll"/>
      <Reference name="OpenMetaverse.dll"/>
      <Reference name="Nini.dll" />
@@ -747,6 +748,7 @@
      <ReferencePath>../../../bin/</ReferencePath>
      <Reference name="System"/>
+      <Reference name="System.Core"/>
      <Reference name="System.Xml"/>
      <Reference name="System.Drawing"/>
      <Reference name="System.Web"/>
@@ -1411,6 +1413,37 @@
      </Files>
    </Project>
+    <Project frameworkVersion="v3_5" name="OpenSim.Services.PresenceService" path="OpenSim/Services/PresenceService" 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.dll"/>
+      <Reference name="OpenMetaverse.dll"/>
+      <Reference name="OpenSim.Framework"/>
+      <Reference name="OpenSim.Framework.Console"/>
+      <Reference name="OpenSim.Framework.Servers.HttpServer"/>
+      <Reference name="OpenSim.Services.Interfaces"/>
+      <Reference name="OpenSim.Services.Base"/>
+      <Reference name="OpenSim.Services.Connectors"/>
+      <Reference name="OpenSim.Data"/>
+      <Reference name="Nini.dll" />
+      <Reference name="log4net.dll"/>
+      <Files>
+        <Match pattern="*.cs" recurse="true"/>
+      </Files>
+    </Project>
    <Project frameworkVersion="v3_5" name="OpenSim.Services.InventoryService" path="OpenSim/Services/InventoryService" type="Library">
      <Configuration name="Debug">
        <Options>
@@ -3135,7 +3168,7 @@
      </Files>
    </Project>
-    <Project name="OpenSim.Tools.lslc" path="OpenSim/Tools/Compiler" type="Exe">
+    <Project frameworkVersion="v3_5" name="OpenSim.Tools.lslc" path="OpenSim/Tools/Compiler" type="Exe">
      <Configuration name="Debug">
        <Options>
          <OutputPath>../../../bin/</OutputPath>
author	Melanie	2009-10-27 11:32:11 +0000
committer	Melanie	2009-10-27 11:32:11 +0000
commit	31a848e97bd984ab0a85feca397ce419f6ae839a (patch)
tree	4743f5eb7c12b3723ed4b986d19714d1b3a0a3ea /prebuild.xml
parent	Commented out instrumentation in ODEPrim.cs (diff)
parent	Finally hunted down the Parallel deadlock. Packets were being handled asynchr... (diff)
download	opensim-SC-31a848e97bd984ab0a85feca397ce419f6ae839a.zip opensim-SC-31a848e97bd984ab0a85feca397ce419f6ae839a.tar.gz opensim-SC-31a848e97bd984ab0a85feca397ce419f6ae839a.tar.bz2 opensim-SC-31a848e97bd984ab0a85feca397ce419f6ae839a.tar.xz

diff --git a/prebuild.xml b/prebuild.xml index 81f907d..12e33e9 100644 --- a/prebuild.xml +++ b/prebuild.xml
@@ -588,6 +588,7 @@
588	<ReferencePath>../../../../bin/</ReferencePath>	588	<ReferencePath>../../../../bin/</ReferencePath>
589	<Reference name="System"/>	589	<Reference name="System"/>
590	<Reference name="System.Drawing"/>	590	<Reference name="System.Drawing"/>
		591	<Reference name="CSJ2K.dll"/>
591	<Reference name="OpenMetaverseTypes.dll"/>	592	<Reference name="OpenMetaverseTypes.dll"/>
592	<Reference name="OpenMetaverse.dll"/>	593	<Reference name="OpenMetaverse.dll"/>
593	<Reference name="Nini.dll" />	594	<Reference name="Nini.dll" />
@@ -747,6 +748,7 @@
747		748
748	<ReferencePath>../../../bin/</ReferencePath>	749	<ReferencePath>../../../bin/</ReferencePath>
749	<Reference name="System"/>	750	<Reference name="System"/>
		751	<Reference name="System.Core"/>
750	<Reference name="System.Xml"/>	752	<Reference name="System.Xml"/>
751	<Reference name="System.Drawing"/>	753	<Reference name="System.Drawing"/>
752	<Reference name="System.Web"/>	754	<Reference name="System.Web"/>
@@ -1411,6 +1413,37 @@
1411	</Files>	1413	</Files>
1412	</Project>	1414	</Project>
1413		1415
		1416	<Project frameworkVersion="v3_5" name="OpenSim.Services.PresenceService" path="OpenSim/Services/PresenceService" type="Library">
		1417	<Configuration name="Debug">
		1418	<Options>
		1419	<OutputPath>../../../bin/</OutputPath>
		1420	</Options>
		1421	</Configuration>
		1422	<Configuration name="Release">
		1423	<Options>
		1424	<OutputPath>../../../bin/</OutputPath>
		1425	</Options>
		1426	</Configuration>
		1427
		1428	<ReferencePath>../../../bin/</ReferencePath>
		1429	<Reference name="System"/>
		1430	<Reference name="OpenMetaverseTypes.dll"/>
		1431	<Reference name="OpenMetaverse.dll"/>
		1432	<Reference name="OpenSim.Framework"/>
		1433	<Reference name="OpenSim.Framework.Console"/>
		1434	<Reference name="OpenSim.Framework.Servers.HttpServer"/>
		1435	<Reference name="OpenSim.Services.Interfaces"/>
		1436	<Reference name="OpenSim.Services.Base"/>
		1437	<Reference name="OpenSim.Services.Connectors"/>
		1438	<Reference name="OpenSim.Data"/>
		1439	<Reference name="Nini.dll" />
		1440	<Reference name="log4net.dll"/>
		1441
		1442	<Files>
		1443	<Match pattern="*.cs" recurse="true"/>
		1444	</Files>
		1445	</Project>
		1446
1414	<Project frameworkVersion="v3_5" name="OpenSim.Services.InventoryService" path="OpenSim/Services/InventoryService" type="Library">	1447	<Project frameworkVersion="v3_5" name="OpenSim.Services.InventoryService" path="OpenSim/Services/InventoryService" type="Library">
1415	<Configuration name="Debug">	1448	<Configuration name="Debug">
1416	<Options>	1449	<Options>
@@ -3135,7 +3168,7 @@
3135	</Files>	3168	</Files>
3136	</Project>	3169	</Project>
3137		3170
3138	<Project name="OpenSim.Tools.lslc" path="OpenSim/Tools/Compiler" type="Exe">	3171	<Project frameworkVersion="v3_5" name="OpenSim.Tools.lslc" path="OpenSim/Tools/Compiler" type="Exe">
3139	<Configuration name="Debug">	3172	<Configuration name="Debug">
3140	<Options>	3173	<Options>
3141	<OutputPath>../../../bin/</OutputPath>	3174	<OutputPath>../../../bin/</OutputPath>