diff options
| author | Melanie | 2009-11-27 00:40:56 +0000 |
|---|---|---|
| committer | Melanie | 2009-11-27 00:40:56 +0000 |
| commit | cc18ab12f87721dfb2db563c4aac68788126f391 (patch) | |
| tree | 5455318e8833287cc53d5a4936233e61a57afacc /OpenSim | |
| parent | Merge branch 'careminster' into tests (diff) | |
| parent | Merge branch 'master' of ssh://MyConnection/var/git/opensim (diff) | |
| download | opensim-SC_OLD-cc18ab12f87721dfb2db563c4aac68788126f391.zip opensim-SC_OLD-cc18ab12f87721dfb2db563c4aac68788126f391.tar.gz opensim-SC_OLD-cc18ab12f87721dfb2db563c4aac68788126f391.tar.bz2 opensim-SC_OLD-cc18ab12f87721dfb2db563c4aac68788126f391.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim')
| -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 b0e9a91..8459dab 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |||
| @@ -2158,7 +2158,10 @@ Console.WriteLine(" JointCreateFixed"); | |||
| 2158 | // Re creates body on size. | 2158 | // Re creates body on size. |
| 2159 | // EnableBody also does setMass() | 2159 | // EnableBody also does setMass() |
| 2160 | enableBody(); | 2160 | enableBody(); |
| 2161 | d.BodyEnable(Body); | 2161 | if (Body != IntPtr.Zero) |
| 2162 | { | ||
| 2163 | d.BodyEnable(Body); | ||
| 2164 | } | ||
| 2162 | } | 2165 | } |
| 2163 | _parent_scene.geom_name_map[prim_geom] = oldname; | 2166 | _parent_scene.geom_name_map[prim_geom] = oldname; |
| 2164 | 2167 | ||