aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics
diff options
context:
space:
mode:
authorTeravus Ovares2008-06-02 08:13:13 +0000
committerTeravus Ovares2008-06-02 08:13:13 +0000
commitc0f631dbdbac0ae2296fc2e1c013484ee0d32a1a (patch)
treea37520bacb7a51d161a2fadbad6fc9a1b7516b96 /OpenSim/Region/Physics
parent* This enables grid-wide instant messaging in a peer to peer with tracker sty... (diff)
downloadopensim-SC_OLD-c0f631dbdbac0ae2296fc2e1c013484ee0d32a1a.zip
opensim-SC_OLD-c0f631dbdbac0ae2296fc2e1c013484ee0d32a1a.tar.gz
opensim-SC_OLD-c0f631dbdbac0ae2296fc2e1c013484ee0d32a1a.tar.bz2
opensim-SC_OLD-c0f631dbdbac0ae2296fc2e1c013484ee0d32a1a.tar.xz
* While I couldn't reproduce it, I was able to see how it *might* happen, so therefore; fix to: 0001058: Physics crash when changing Type of Prim intersecting with ground.
Diffstat (limited to 'OpenSim/Region/Physics')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODEPrim.cs7
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index 6ade638..507030b 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -882,8 +882,11 @@ namespace OpenSim.Region.Physics.OdePlugin
882 } 882 }
883 if (m_isphysical) 883 if (m_isphysical)
884 { 884 {
885 d.BodySetLinearVel(Body, 0f, 0f, 0f); 885 if (Body != IntPtr.Zero)
886 enableBodySoft(); 886 {
887 d.BodySetLinearVel(Body, 0f, 0f, 0f);
888 enableBodySoft();
889 }
887 } 890 }
888 } 891 }
889 892