aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorTedd Hansen2007-08-26 15:56:42 +0000
committerTedd Hansen2007-08-26 15:56:42 +0000
commit87711c58696a7033a59b9ee61bce217da35c7f63 (patch)
tree21be532b90a1991e7064e540f09db2db6990e9ac /OpenSim/Region
parentin-world run-time error-message no-w con-tains function-name. (diff)
downloadopensim-SC-87711c58696a7033a59b9ee61bce217da35c7f63.zip
opensim-SC-87711c58696a7033a59b9ee61bce217da35c7f63.tar.gz
opensim-SC-87711c58696a7033a59b9ee61bce217da35c7f63.tar.bz2
opensim-SC-87711c58696a7033a59b9ee61bce217da35c7f63.tar.xz
Danxors patch for >30prims with ODE
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdePlugin.cs12
1 files changed, 4 insertions, 8 deletions
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
114 return; 114 return;
115 115
116 int count = d.Collide(g1, g2, 500, contacts, d.ContactGeom.SizeOf); 116 int count = d.Collide(g1, g2, 500, contacts, d.ContactGeom.SizeOf);
117 if (count>0)
118 {
119 if (b2 != IntPtr.Zero)
120 {
121 Console.WriteLine("+++++ collision twixt: " + b1 + " & " + b2);
122 }
123 }
124 for (int i = 0; i < count; ++i) 117 for (int i = 0; i < count; ++i)
125 { 118 {
126 contact.geom = contacts[i]; 119 contact.geom = contacts[i];
@@ -171,7 +164,10 @@ namespace OpenSim.Region.Physics.OdePlugin
171 rot.x = rotation.x; 164 rot.x = rotation.x;
172 rot.y = rotation.y; 165 rot.y = rotation.y;
173 rot.z = rotation.z; 166 rot.z = rotation.z;
174 OdePrim newPrim = new OdePrim(this, pos, siz, rot); 167 OdePrim newPrim;
168 lock(typeof(OdeScene)) {
169 newPrim = new OdePrim(this, pos, siz, rot);
170 }
175 this._prims.Add(newPrim); 171 this._prims.Add(newPrim);
176 return newPrim; 172 return newPrim;
177 } 173 }