aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-04-21 03:42:54 +0100
committerJustin Clark-Casey (justincc)2012-04-21 03:42:54 +0100
commitae2b8f70074e4dfe2cbbd03dd543c7468fc50cc1 (patch)
tree00bcb14ed432c3ea1ad66ce9a3ea68f2467e2587 /OpenSim/Region/Physics/OdePlugin/OdeScene.cs
parentrefactor: Simplify ODEPrim.AddChildPrim() by returning early where appropriate. (diff)
downloadopensim-SC-ae2b8f70074e4dfe2cbbd03dd543c7468fc50cc1.zip
opensim-SC-ae2b8f70074e4dfe2cbbd03dd543c7468fc50cc1.tar.gz
opensim-SC-ae2b8f70074e4dfe2cbbd03dd543c7468fc50cc1.tar.bz2
opensim-SC-ae2b8f70074e4dfe2cbbd03dd543c7468fc50cc1.tar.xz
Comment out spurious Body != IntPtr.Zero code after disableBody(), since disableBody() sets Body == IntPtr.Zero on all code paths.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdeScene.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
index 842ff91..409b27b 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
@@ -2226,7 +2226,8 @@ namespace OpenSim.Region.Physics.OdePlugin
2226 /// <param name="prim"></param> 2226 /// <param name="prim"></param>
2227 internal void RemovePrimThreadLocked(OdePrim prim) 2227 internal void RemovePrimThreadLocked(OdePrim prim)
2228 { 2228 {
2229//Console.WriteLine("RemovePrimThreadLocked " + prim.m_primName); 2229// m_log.DebugFormat("[ODE SCENE]: Removing physical prim {0} {1}", prim.Name, prim.LocalID);
2230
2230 lock (prim) 2231 lock (prim)
2231 { 2232 {
2232 RemoveCollisionEventReporting(prim); 2233 RemoveCollisionEventReporting(prim);