Merge commit 'f95033812402aaf31a9f2f66c946165d2d79669f' into bigmerge

Conflicts: OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs prebuild.xml
author: Melanie 2011-10-11 22:22:34 +0100
committer: Melanie 2011-10-11 22:22:34 +0100
commit: b9de3b7f5b3b99ac430584ee5c3891b5871533a4 (patch)
tree: d3d77a673689064324ef7b3c6686c2efb4d159f5 /prebuild.xml
parent: Merge commit '6f69ab3bcb932589f102c16b718e7f8964d2c8eb' into bigmerge (diff)
parent: Remove old bullet DotNET and X libraries in preparation for BulletS (diff)
download: opensim-SC-b9de3b7f5b3b99ac430584ee5c3891b5871533a4.zip
opensim-SC-b9de3b7f5b3b99ac430584ee5c3891b5871533a4.tar.gz
opensim-SC-b9de3b7f5b3b99ac430584ee5c3891b5871533a4.tar.bz2
opensim-SC-b9de3b7f5b3b99ac430584ee5c3891b5871533a4.tar.xz
1 files changed, 0 insertions, 56 deletions
diff --git a/prebuild.xml b/prebuild.xml
index 1537f6c..309a459 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -603,34 +603,6 @@
      </Files>
    </Project>
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.BulletXPlugin" path="OpenSim/Region/Physics/BulletXPlugin" type="Library">
-      <Configuration name="Debug">
-        <Options>
-          <OutputPath>../../../../bin/Physics/</OutputPath>
-        </Options>
-      </Configuration>
-      <Configuration name="Release">
-        <Options>
-          <OutputPath>../../../../bin/Physics/</OutputPath>
-        </Options>
-      </Configuration>
-      <ReferencePath>../../../../bin/</ReferencePath>
-      <Reference name="System"/>
-      <Reference name="OpenMetaverseTypes" path="../../../../bin/"/>
-      <Reference name="Nini" path="../../../../bin/"/>
-      <Reference name="OpenSim.Framework"/>
-      <Reference name="OpenSim.Framework.Console"/>
-      <Reference name="OpenSim.Region.Physics.Manager"/>
-      <Reference name="MonoXnaCompactMaths" path="../../../../bin/"/>
-      <Reference name="Modified.XnaDevRu.BulletX" path="../../../../bin/"/>
-      <Reference name="log4net" path="../../../../bin/"/>
-      <Files>
-        <Match pattern="*.cs" recurse="true"/>
-      </Files>
-    </Project>
    <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.ConvexDecompositionDotNet" path="OpenSim/Region/Physics/ConvexDecompositionDotNet" type="Library">
      <Configuration name="Debug">
        <Options>
@@ -720,34 +692,6 @@
      </Files>
    </Project>
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.BulletDotNETPlugin" path="OpenSim/Region/Physics/BulletDotNETPlugin" type="Library">
-      <Configuration name="Debug">
-        <Options>
-          <OutputPath>../../../../bin/Physics/</OutputPath>
-        </Options>
-      </Configuration>
-      <Configuration name="Release">
-        <Options>
-          <OutputPath>../../../../bin/Physics/</OutputPath>
-        </Options>
-      </Configuration>
-      <ReferencePath>../../../../bin/</ReferencePath>
-      <Reference name="System"/>
-      <Reference name="OpenMetaverseTypes" path="../../../../bin/"/>
-      <Reference name="Nini" path="../../../../bin/"/>
-      <Reference name="OpenSim.Framework"/>
-      <Reference name="OpenSim.Framework.Console"/>
-      <Reference name="OpenSim.Region.Physics.Manager"/>
-      <Reference name="BulletDotNET" path="../../../../bin/"/>
-      <Reference name="nunit.framework" path="../../../../bin/"/>
-      <Reference name="log4net" path="../../../../bin/"/>
-      <Files>
-        <Match pattern="*.cs" recurse="true"/>
-      </Files>
-    </Project>
    <Project frameworkVersion="v3_5" name="OpenSim.Capabilities" path="OpenSim/Capabilities" type="Library">
      <Configuration name="Debug">
        <Options>
author	Melanie	2011-10-11 22:22:34 +0100
committer	Melanie	2011-10-11 22:22:34 +0100
commit	b9de3b7f5b3b99ac430584ee5c3891b5871533a4 (patch)
tree	d3d77a673689064324ef7b3c6686c2efb4d159f5 /prebuild.xml
parent	Merge commit '6f69ab3bcb932589f102c16b718e7f8964d2c8eb' into bigmerge (diff)
parent	Remove old bullet DotNET and X libraries in preparation for BulletS (diff)
download	opensim-SC-b9de3b7f5b3b99ac430584ee5c3891b5871533a4.zip opensim-SC-b9de3b7f5b3b99ac430584ee5c3891b5871533a4.tar.gz opensim-SC-b9de3b7f5b3b99ac430584ee5c3891b5871533a4.tar.bz2 opensim-SC-b9de3b7f5b3b99ac430584ee5c3891b5871533a4.tar.xz

diff --git a/prebuild.xml b/prebuild.xml index 1537f6c..309a459 100644 --- a/prebuild.xml +++ b/prebuild.xml
@@ -603,34 +603,6 @@
603	</Files>	603	</Files>
604	</Project>	604	</Project>
605		605
606	<Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.BulletXPlugin" path="OpenSim/Region/Physics/BulletXPlugin" type="Library">
607	<Configuration name="Debug">
608	<Options>
609	<OutputPath>../../../../bin/Physics/</OutputPath>
610	</Options>
611	</Configuration>
612	<Configuration name="Release">
613	<Options>
614	<OutputPath>../../../../bin/Physics/</OutputPath>
615	</Options>
616	</Configuration>
617
618	<ReferencePath>../../../../bin/</ReferencePath>
619	<Reference name="System"/>
620	<Reference name="OpenMetaverseTypes" path="../../../../bin/"/>
621	<Reference name="Nini" path="../../../../bin/"/>
622	<Reference name="OpenSim.Framework"/>
623	<Reference name="OpenSim.Framework.Console"/>
624	<Reference name="OpenSim.Region.Physics.Manager"/>
625	<Reference name="MonoXnaCompactMaths" path="../../../../bin/"/>
626	<Reference name="Modified.XnaDevRu.BulletX" path="../../../../bin/"/>
627	<Reference name="log4net" path="../../../../bin/"/>
628
629	<Files>
630	<Match pattern="*.cs" recurse="true"/>
631	</Files>
632	</Project>
633
634	<Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.ConvexDecompositionDotNet" path="OpenSim/Region/Physics/ConvexDecompositionDotNet" type="Library">	606	<Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.ConvexDecompositionDotNet" path="OpenSim/Region/Physics/ConvexDecompositionDotNet" type="Library">
635	<Configuration name="Debug">	607	<Configuration name="Debug">
636	<Options>	608	<Options>
@@ -720,34 +692,6 @@
720	</Files>	692	</Files>
721	</Project>	693	</Project>
722		694
723	<Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.BulletDotNETPlugin" path="OpenSim/Region/Physics/BulletDotNETPlugin" type="Library">
724	<Configuration name="Debug">
725	<Options>
726	<OutputPath>../../../../bin/Physics/</OutputPath>
727	</Options>
728	</Configuration>
729	<Configuration name="Release">
730	<Options>
731	<OutputPath>../../../../bin/Physics/</OutputPath>
732	</Options>
733	</Configuration>
734
735	<ReferencePath>../../../../bin/</ReferencePath>
736	<Reference name="System"/>
737	<Reference name="OpenMetaverseTypes" path="../../../../bin/"/>
738	<Reference name="Nini" path="../../../../bin/"/>
739	<Reference name="OpenSim.Framework"/>
740	<Reference name="OpenSim.Framework.Console"/>
741	<Reference name="OpenSim.Region.Physics.Manager"/>
742	<Reference name="BulletDotNET" path="../../../../bin/"/>
743	<Reference name="nunit.framework" path="../../../../bin/"/>
744	<Reference name="log4net" path="../../../../bin/"/>
745
746	<Files>
747	<Match pattern="*.cs" recurse="true"/>
748	</Files>
749	</Project>
750
751	<Project frameworkVersion="v3_5" name="OpenSim.Capabilities" path="OpenSim/Capabilities" type="Library">	695	<Project frameworkVersion="v3_5" name="OpenSim.Capabilities" path="OpenSim/Capabilities" type="Library">
752	<Configuration name="Debug">	696	<Configuration name="Debug">
753	<Options>	697	<Options>