aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/PhysicsModules/ubOde
diff options
context:
space:
mode:
authorUbitUmarov2017-07-16 02:55:39 +0100
committerUbitUmarov2017-07-16 02:55:39 +0100
commit04b97be71e6e33214491ee9f6fcf94d3978f45f7 (patch)
tree9828e1516c1bd9a9796121dc17ec2012be921241 /OpenSim/Region/PhysicsModules/ubOde
parentdon't start moving KFM things on region start that where stopped on last shut... (diff)
downloadopensim-SC-04b97be71e6e33214491ee9f6fcf94d3978f45f7.zip
opensim-SC-04b97be71e6e33214491ee9f6fcf94d3978f45f7.tar.gz
opensim-SC-04b97be71e6e33214491ee9f6fcf94d3978f45f7.tar.bz2
opensim-SC-04b97be71e6e33214491ee9f6fcf94d3978f45f7.tar.xz
ode does not like null refs
Diffstat (limited to 'OpenSim/Region/PhysicsModules/ubOde')
-rw-r--r--OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs b/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs
index 44e722c..76ef88b 100644
--- a/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs
+++ b/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs
@@ -1043,7 +1043,8 @@ namespace OpenSim.Region.PhysicsModule.ubOde
1043 d.BodySetLinearVel(Body, 0, 0, 0); // stop it 1043 d.BodySetLinearVel(Body, 0, 0, 0); // stop it
1044 d.BodySetAngularVel(Body, 0, 0, 0); 1044 d.BodySetAngularVel(Body, 0, 0, 0);
1045 } 1045 }
1046 d.GeomSetPosition(prim_geom, _position.X, _position.Y, _position.Z); 1046 if(prim_geom != IntPtr.Zero)
1047 d.GeomSetPosition(prim_geom, _position.X, _position.Y, _position.Z);
1047 disableBodySoft(); // stop collisions 1048 disableBodySoft(); // stop collisions
1048 UnSubscribeEvents(); 1049 UnSubscribeEvents();
1049 } 1050 }