OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

minor: add note to RemovePrimThreadLocked() to the effect that it contrary to the summary, it is being called from within Simulate() lock (OdeLock)

bulletsim
Justin Clark-Casey (justincc) 2011-08-01 05:48:27 +01:00
parent dfa2f7d715
commit 509200d5cd
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
View File

@ -1352,7 +1352,7 @@ Console.WriteLine("ZProcessTaints for " + Name);
} }
/// <summary> /// <summary>
/// Create a geometry for the given mesh in the given target space. /// Create a geometry for the given mesh/shape in the given target space.
/// </summary> /// </summary>
/// <param name="m_targetSpace"></param> /// <param name="m_targetSpace"></param>
/// <param name="mesh">If null, then a mesh is used that is based on the profile shape data.</param> /// <param name="mesh">If null, then a mesh is used that is based on the profile shape data.</param>

3
OpenSim/Region/Physics/OdePlugin/OdeScene.cs
View File

@ -2110,6 +2110,9 @@ namespace OpenSim.Region.Physics.OdePlugin
/// <summary> /// <summary>
/// This is called from within simulate but outside the locked portion /// This is called from within simulate but outside the locked portion
/// We need to do our own locking here /// We need to do our own locking here
/// (Note: As of 20110801 this no longer appears to be true - this is being called within lock (odeLock) in
/// Simulate() -- justincc).
///
/// Essentially, we need to remove the prim from our space segment, whatever segment it's in. /// Essentially, we need to remove the prim from our space segment, whatever segment it's in.
/// ///
/// If there are no more prim in the segment, we need to empty (spacedestroy)the segment and reclaim memory /// If there are no more prim in the segment, we need to empty (spacedestroy)the segment and reclaim memory