diff options
author | Teravus Ovares (Dan Olivares) | 2009-11-26 17:03:00 -0500 |
---|---|---|
committer | Teravus Ovares (Dan Olivares) | 2009-11-26 17:03:00 -0500 |
commit | e2200026ca6ad31adac8f98281c71930d9445ab8 (patch) | |
tree | 2b7de90954adf1cd7d85daa245a92994a98140d9 /OpenSim/Region | |
parent | * Re-enable the AbsolutePosition = AbsolutePosition in the LSL_Api in the Set... (diff) | |
download | opensim-SC-e2200026ca6ad31adac8f98281c71930d9445ab8.zip opensim-SC-e2200026ca6ad31adac8f98281c71930d9445ab8.tar.gz opensim-SC-e2200026ca6ad31adac8f98281c71930d9445ab8.tar.bz2 opensim-SC-e2200026ca6ad31adac8f98281c71930d9445ab8.tar.xz |
* Fixes a case of d.BodyEnable with IntPtr.Zero passed as the parameter in linkset where EnableBody was called and the body is immediately disabled. The previous functionality assumed that a body was received in EnableBody but.. in some cases, it wasn't.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index 17552d2..9e9c36f 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |||
@@ -2099,7 +2099,10 @@ Console.WriteLine(" JointCreateFixed"); | |||
2099 | // Re creates body on size. | 2099 | // Re creates body on size. |
2100 | // EnableBody also does setMass() | 2100 | // EnableBody also does setMass() |
2101 | enableBody(); | 2101 | enableBody(); |
2102 | d.BodyEnable(Body); | 2102 | if (Body != IntPtr.Zero) |
2103 | { | ||
2104 | d.BodyEnable(Body); | ||
2105 | } | ||
2103 | } | 2106 | } |
2104 | _parent_scene.geom_name_map[prim_geom] = oldname; | 2107 | _parent_scene.geom_name_map[prim_geom] = oldname; |
2105 | 2108 | ||