aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorRobert Adams2012-12-06 09:21:04 -0800
committerRobert Adams2012-12-06 09:30:50 -0800
commitcc59e3cbdf2d660422bc8707816d7d30d7c72b92 (patch)
tree7efaeb8f38045e39aba7e56cdcae8ab37d02790f
parentBulletSim: add values for material friction and restitution. Fix line endings... (diff)
downloadopensim-SC_OLD-cc59e3cbdf2d660422bc8707816d7d30d7c72b92.zip
opensim-SC_OLD-cc59e3cbdf2d660422bc8707816d7d30d7c72b92.tar.gz
opensim-SC_OLD-cc59e3cbdf2d660422bc8707816d7d30d7c72b92.tar.bz2
opensim-SC_OLD-cc59e3cbdf2d660422bc8707816d7d30d7c72b92.tar.xz
BulletSim: only check position sanity if the prim is physical -- the user can do anything dumb they wish.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs4
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index e392078..62aaf80 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -1399,7 +1399,7 @@ public sealed class BSPrim : BSPhysObject
1399 _rotationalVelocity = entprop.RotationalVelocity; 1399 _rotationalVelocity = entprop.RotationalVelocity;
1400 1400
1401 // The sanity check can change the velocity and/or position. 1401 // The sanity check can change the velocity and/or position.
1402 if (PositionSanityCheck(true)) 1402 if (IsPhysical && PositionSanityCheck(true))
1403 { 1403 {
1404 entprop.Position = _position; 1404 entprop.Position = _position;
1405 entprop.Velocity = _velocity; 1405 entprop.Velocity = _velocity;
@@ -1413,8 +1413,6 @@ public sealed class BSPrim : BSPhysObject
1413 DetailLog("{0},BSPrim.UpdateProperties,call,pos={1},orient={2},dir={3},vel={4},rotVel={5}", 1413 DetailLog("{0},BSPrim.UpdateProperties,call,pos={1},orient={2},dir={3},vel={4},rotVel={5}",
1414 LocalID, _position, _orientation, direction, _velocity, _rotationalVelocity); 1414 LocalID, _position, _orientation, direction, _velocity, _rotationalVelocity);
1415 1415
1416 // BulletSimAPI.DumpRigidBody2(PhysicsScene.World.ptr, BSBody.ptr); // DEBUG DEBUG DEBUG
1417
1418 base.RequestPhysicsterseUpdate(); 1416 base.RequestPhysicsterseUpdate();
1419 } 1417 }
1420 /* 1418 /*