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

Comment out spurious Body != IntPtr.Zero code after disableBody(), since disableBody() sets Body == IntPtr.Zero on all code paths.

0.7.3-extended
Justin Clark-Casey (justincc) 2012-04-21 03:42:54 +01:00
parent 232f59749e
commit 2889961622
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1056,7 +1056,9 @@ Console.WriteLine("ZProcessTaints for " + Name);
if (childrenPrim.Contains(prim)) if (childrenPrim.Contains(prim))
return; return;
//Console.WriteLine("childrenPrim.Add " + prim); // m_log.DebugFormat(
// "[ODE PRIM]: Linking prim {0} {1} to {2} {3}", prim.Name, prim.LocalID, Name, LocalID);
childrenPrim.Add(prim); childrenPrim.Add(prim);
foreach (OdePrim prm in childrenPrim) foreach (OdePrim prm in childrenPrim)
@ -1194,12 +1196,14 @@ Console.WriteLine("ZProcessTaints for " + Name);
//prm.childPrim = false; //prm.childPrim = false;
} }
} }
disableBody(); disableBody();
if (Body != IntPtr.Zero) // Spurious - Body == IntPtr.Zero after disableBody()
{ // if (Body != IntPtr.Zero)
_parent_scene.DeactivatePrim(this); // {
} // _parent_scene.DeactivatePrim(this);
// }
lock (childrenPrim) lock (childrenPrim)
{ {
@ -1213,6 +1217,9 @@ Console.WriteLine("ZProcessTaints for " + Name);
private void ChildDelink(OdePrim odePrim) private void ChildDelink(OdePrim odePrim)
{ {
// m_log.DebugFormat(
// "[ODE PRIM]: Delinking prim {0} {1} from {2} {3}", odePrim.Name, odePrim.LocalID, Name, LocalID);
// Okay, we have a delinked child.. need to rebuild the body. // Okay, we have a delinked child.. need to rebuild the body.
lock (childrenPrim) lock (childrenPrim)
{ {
@ -1227,6 +1234,7 @@ Console.WriteLine("ZProcessTaints for " + Name);
//prm.childPrim = false; //prm.childPrim = false;
} }
} }
disableBody(); disableBody();
lock (childrenPrim) lock (childrenPrim)
@ -1235,10 +1243,11 @@ Console.WriteLine("ZProcessTaints for " + Name);
childrenPrim.Remove(odePrim); childrenPrim.Remove(odePrim);
} }
if (Body != IntPtr.Zero) // Spurious - Body == IntPtr.Zero after disableBody()
{ // if (Body != IntPtr.Zero)
_parent_scene.DeactivatePrim(this); // {
} // _parent_scene.DeactivatePrim(this);
// }
lock (childrenPrim) lock (childrenPrim)
{ {

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

@ -2226,7 +2226,8 @@ namespace OpenSim.Region.Physics.OdePlugin
/// <param name="prim"></param> /// <param name="prim"></param>
internal void RemovePrimThreadLocked(OdePrim prim) internal void RemovePrimThreadLocked(OdePrim prim)
{ {
//Console.WriteLine("RemovePrimThreadLocked " + prim.m_primName); // m_log.DebugFormat("[ODE SCENE]: Removing physical prim {0} {1}", prim.Name, prim.LocalID);
lock (prim) lock (prim)
{ {
RemoveCollisionEventReporting(prim); RemoveCollisionEventReporting(prim);