From 2fd8819a043269f9308cb46c71893e6eb35a426e Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 21 May 2013 21:32:30 -0700
Subject: BulletSim: add code to experimentally use asset hull data. Default to
 'off' as it needs debugging.

---
 prebuild.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'prebuild.xml')

diff --git a/prebuild.xml b/prebuild.xml
index 9fbe08b..f51e8f0 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1753,6 +1753,7 @@
       <Reference name="OpenSim.Region.CoreModules"/>
       <Reference name="OpenSim.Framework.Console"/>
       <Reference name="OpenSim.Region.Physics.Manager"/>
+      <Reference name="OpenSim.Region.Physics.Meshing"/>
       <Reference name="OpenSim.Region.Physics.ConvexDecompositionDotNet"/>
       <Reference name="BulletXNA.dll" path="../../../../bin/"/>
       <Reference name="log4net.dll" path="../../../../bin/"/>
-- 
cgit v1.1


From 6596a1de806d1ec509f3a570a0944ab9aff5947c Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 21 May 2013 22:16:18 -0700
Subject: Revert "BulletSim: add code to experimentally use asset hull data."

This reverts commit 2fd8819a043269f9308cb46c71893e6eb35a426e.

Remove this code until I can figure out why the references that are
clearly in prebuild.xml doesn't work for the
'using OpenSim.Region.Physics.Meshing' in BSShape.cs.
---
 prebuild.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'prebuild.xml')

diff --git a/prebuild.xml b/prebuild.xml
index f51e8f0..9fbe08b 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1753,7 +1753,6 @@
       <Reference name="OpenSim.Region.CoreModules"/>
       <Reference name="OpenSim.Framework.Console"/>
       <Reference name="OpenSim.Region.Physics.Manager"/>
-      <Reference name="OpenSim.Region.Physics.Meshing"/>
       <Reference name="OpenSim.Region.Physics.ConvexDecompositionDotNet"/>
       <Reference name="BulletXNA.dll" path="../../../../bin/"/>
       <Reference name="log4net.dll" path="../../../../bin/"/>
-- 
cgit v1.1


From ffc9b3dda766c15e053b9296d15356533f7e99f8 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 21 May 2013 21:32:30 -0700
Subject: BulletSim: add code to experimentally use asset hull data. Default to
 'off' as it needs debugging.

---
 prebuild.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'prebuild.xml')

diff --git a/prebuild.xml b/prebuild.xml
index 9fbe08b..f51e8f0 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1753,6 +1753,7 @@
       <Reference name="OpenSim.Region.CoreModules"/>
       <Reference name="OpenSim.Framework.Console"/>
       <Reference name="OpenSim.Region.Physics.Manager"/>
+      <Reference name="OpenSim.Region.Physics.Meshing"/>
       <Reference name="OpenSim.Region.Physics.ConvexDecompositionDotNet"/>
       <Reference name="BulletXNA.dll" path="../../../../bin/"/>
       <Reference name="log4net.dll" path="../../../../bin/"/>
-- 
cgit v1.1


From f4905220821671f91cb830e9932a0b9ed5d3da49 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Wed, 22 May 2013 21:09:37 -0700
Subject: BulletSim: specify directory for OpenSim.Region.Physics.Meshing DLL
 file in prebuild.xml since that file ends up in bin/Physics directory.

---
 prebuild.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'prebuild.xml')

diff --git a/prebuild.xml b/prebuild.xml
index f51e8f0..25c287e 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1753,7 +1753,7 @@
       <Reference name="OpenSim.Region.CoreModules"/>
       <Reference name="OpenSim.Framework.Console"/>
       <Reference name="OpenSim.Region.Physics.Manager"/>
-      <Reference name="OpenSim.Region.Physics.Meshing"/>
+      <Reference name="OpenSim.Region.Physics.Meshing" path="../../../../bin/Physics/"/>
       <Reference name="OpenSim.Region.Physics.ConvexDecompositionDotNet"/>
       <Reference name="BulletXNA.dll" path="../../../../bin/"/>
       <Reference name="log4net.dll" path="../../../../bin/"/>
-- 
cgit v1.1