aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin/OdePlugin.cs')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdePlugin.cs16
1 files changed, 9 insertions, 7 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index a2f440e..c346960 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -27,11 +27,13 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection;
30using System.Runtime.InteropServices; 31using System.Runtime.InteropServices;
32using System.Threading;
31using Axiom.Math; 33using Axiom.Math;
34using log4net;
32using Ode.NET; 35using Ode.NET;
33using OpenSim.Framework; 36using OpenSim.Framework;
34using OpenSim.Framework.Console;
35using OpenSim.Region.Physics.Manager; 37using OpenSim.Region.Physics.Manager;
36 38
37//using OpenSim.Region.Physics.OdePlugin.Meshing; 39//using OpenSim.Region.Physics.OdePlugin.Meshing;
@@ -114,12 +116,12 @@ namespace OpenSim.Region.Physics.OdePlugin
114 116
115 public class OdeScene : PhysicsScene 117 public class OdeScene : PhysicsScene
116 { 118 {
117 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 119 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
118 private Dictionary<string, sCollisionData> m_storedCollisions = new Dictionary<string, sCollisionData>(); 120 private Dictionary<string, sCollisionData> m_storedCollisions = new Dictionary<string, sCollisionData>();
119 121
120 CollisionLocker ode; 122 CollisionLocker ode;
121 123
122 protected Random fluidRandomizer = new Random(System.Environment.TickCount); 124 protected Random fluidRandomizer = new Random(Environment.TickCount);
123 125
124 private const uint m_regionWidth = Constants.RegionSize; 126 private const uint m_regionWidth = Constants.RegionSize;
125 private const uint m_regionHeight = Constants.RegionSize; 127 private const uint m_regionHeight = Constants.RegionSize;
@@ -331,7 +333,7 @@ namespace OpenSim.Region.Physics.OdePlugin
331 { 333 {
332 d.SpaceCollide2(g1, g2, IntPtr.Zero, nearCallback); 334 d.SpaceCollide2(g1, g2, IntPtr.Zero, nearCallback);
333 } 335 }
334 catch (System.AccessViolationException) 336 catch (AccessViolationException)
335 { 337 {
336 m_log.Warn("[PHYSICS]: Unable to collide test a space"); 338 m_log.Warn("[PHYSICS]: Unable to collide test a space");
337 return; 339 return;
@@ -404,7 +406,7 @@ namespace OpenSim.Region.Physics.OdePlugin
404 ode.drelease(world); 406 ode.drelease(world);
405 base.TriggerPhysicsBasedRestart(); 407 base.TriggerPhysicsBasedRestart();
406 } 408 }
407 catch (System.AccessViolationException) 409 catch (AccessViolationException)
408 { 410 {
409 411
410 m_log.Warn("[PHYSICS]: Unable to collide test an object"); 412 m_log.Warn("[PHYSICS]: Unable to collide test an object");
@@ -1166,7 +1168,7 @@ namespace OpenSim.Region.Physics.OdePlugin
1166 } 1168 }
1167 1169
1168 } 1170 }
1169 catch (System.AccessViolationException) 1171 catch (AccessViolationException)
1170 { 1172 {
1171 m_log.Info("[PHYSICS]: Couldn't remove prim from physics scene, it was already be removed."); 1173 m_log.Info("[PHYSICS]: Couldn't remove prim from physics scene, it was already be removed.");
1172 } 1174 }
@@ -1243,7 +1245,7 @@ namespace OpenSim.Region.Physics.OdePlugin
1243 // never be called if the prim is physical(active) 1245 // never be called if the prim is physical(active)
1244 1246
1245 // All physical prim end up in the root space 1247 // All physical prim end up in the root space
1246 System.Threading.Thread.Sleep(20); 1248 Thread.Sleep(20);
1247 if (currentspace != space) 1249 if (currentspace != space)
1248 { 1250 {
1249 //m_log.Info("[SPACE]: C:" + currentspace.ToString() + " g:" + geom.ToString()); 1251 //m_log.Info("[SPACE]: C:" + currentspace.ToString() + " g:" + geom.ToString());