aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODEPrim.cs2
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdeScene.cs3
2 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index e18e1b4..61408f0 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -1352,7 +1352,7 @@ Console.WriteLine("ZProcessTaints for " + Name);
1352 } 1352 }
1353 1353
1354 /// <summary> 1354 /// <summary>
1355 /// Create a geometry for the given mesh in the given target space. 1355 /// Create a geometry for the given mesh/shape in the given target space.
1356 /// </summary> 1356 /// </summary>
1357 /// <param name="m_targetSpace"></param> 1357 /// <param name="m_targetSpace"></param>
1358 /// <param name="mesh">If null, then a mesh is used that is based on the profile shape data.</param> 1358 /// <param name="mesh">If null, then a mesh is used that is based on the profile shape data.</param>
diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
index c1c4d11..4419dff 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
@@ -2110,6 +2110,9 @@ namespace OpenSim.Region.Physics.OdePlugin
2110 /// <summary> 2110 /// <summary>
2111 /// This is called from within simulate but outside the locked portion 2111 /// This is called from within simulate but outside the locked portion
2112 /// We need to do our own locking here 2112 /// We need to do our own locking here
2113 /// (Note: As of 20110801 this no longer appears to be true - this is being called within lock (odeLock) in
2114 /// Simulate() -- justincc).
2115 ///
2113 /// Essentially, we need to remove the prim from our space segment, whatever segment it's in. 2116 /// Essentially, we need to remove the prim from our space segment, whatever segment it's in.
2114 /// 2117 ///
2115 /// If there are no more prim in the segment, we need to empty (spacedestroy)the segment and reclaim memory 2118 /// If there are no more prim in the segment, we need to empty (spacedestroy)the segment and reclaim memory