From 87711c58696a7033a59b9ee61bce217da35c7f63 Mon Sep 17 00:00:00 2001
From: Tedd Hansen
Date: Sun, 26 Aug 2007 15:56:42 +0000
Subject: Danxors patch for >30prims with ODE

---
 OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 420693b..5e8f3c1 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -114,13 +114,6 @@ namespace OpenSim.Region.Physics.OdePlugin
                 return;
 
             int count = d.Collide(g1, g2, 500, contacts, d.ContactGeom.SizeOf);
-            if (count>0)
-            {
-                if (b2 != IntPtr.Zero)
-                {
-                    Console.WriteLine("+++++ collision twixt: " + b1 + " & " + b2);
-                }
-            }
             for (int i = 0; i < count; ++i)
             {
                 contact.geom = contacts[i];
@@ -171,7 +164,10 @@ namespace OpenSim.Region.Physics.OdePlugin
             rot.x = rotation.x;
             rot.y = rotation.y;
             rot.z = rotation.z;
-            OdePrim newPrim = new OdePrim(this, pos, siz, rot);
+            OdePrim newPrim;
+            lock(typeof(OdeScene)) {
+                newPrim = new OdePrim(this, pos, siz, rot);
+            }
             this._prims.Add(newPrim);
             return newPrim;
         }
-- 
cgit v1.1