diff options
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs')
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs index 3421e30..b9e1908 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | |||
@@ -333,7 +333,7 @@ public sealed class BSPrim : BSPhysObject | |||
333 | // just assign to "Position" because of potential call loops. | 333 | // just assign to "Position" because of potential call loops. |
334 | BSScene.TaintCallback sanityOperation = delegate() | 334 | BSScene.TaintCallback sanityOperation = delegate() |
335 | { | 335 | { |
336 | DetailLog("{0},BSPrim.PositionSanityCheck,taint,pos={1},orient={2}", LocalID, _position, _orientation); | 336 | DetailLog("{0},BSPrim.PositionSanityCheck,taint,pos={1},orient={2}", LocalID, _position, _orientation); |
337 | ForcePosition = _position; | 337 | ForcePosition = _position; |
338 | }; | 338 | }; |
339 | if (inTaintTime) | 339 | if (inTaintTime) |
@@ -822,7 +822,7 @@ public sealed class BSPrim : BSPhysObject | |||
822 | set { | 822 | set { |
823 | _buoyancy = value; | 823 | _buoyancy = value; |
824 | PhysicsScene.TaintedObject("BSPrim.setBuoyancy", delegate() | 824 | PhysicsScene.TaintedObject("BSPrim.setBuoyancy", delegate() |
825 | { | 825 | { |
826 | ForceBuoyancy = _buoyancy; | 826 | ForceBuoyancy = _buoyancy; |
827 | }); | 827 | }); |
828 | } | 828 | } |
@@ -1286,8 +1286,8 @@ public sealed class BSPrim : BSPhysObject | |||
1286 | const float VELOCITY_TOLERANCE = 0.001f; | 1286 | const float VELOCITY_TOLERANCE = 0.001f; |
1287 | const float POSITION_TOLERANCE = 0.05f; | 1287 | const float POSITION_TOLERANCE = 0.05f; |
1288 | const float ACCELERATION_TOLERANCE = 0.01f; | 1288 | const float ACCELERATION_TOLERANCE = 0.01f; |
1289 | const float ROTATIONAL_VELOCITY_TOLERANCE = 0.01f; | 1289 | const float ROTATIONAL_VELOCITY_TOLERANCE = 0.01f; |
1290 | 1290 | ||
1291 | public override void UpdateProperties(EntityProperties entprop) | 1291 | public override void UpdateProperties(EntityProperties entprop) |
1292 | { | 1292 | { |
1293 | /* | 1293 | /* |
@@ -1343,10 +1343,10 @@ public sealed class BSPrim : BSPhysObject | |||
1343 | _orientation = entprop.Rotation; | 1343 | _orientation = entprop.Rotation; |
1344 | _velocity = entprop.Velocity; | 1344 | _velocity = entprop.Velocity; |
1345 | _acceleration = entprop.Acceleration; | 1345 | _acceleration = entprop.Acceleration; |
1346 | _rotationalVelocity = entprop.RotationalVelocity; | 1346 | _rotationalVelocity = entprop.RotationalVelocity; |
1347 | 1347 | ||
1348 | // remember the current and last set values | 1348 | // remember the current and last set values |
1349 | LastEntityProperties = CurrentEntityProperties; | 1349 | LastEntityProperties = CurrentEntityProperties; |
1350 | CurrentEntityProperties = entprop; | 1350 | CurrentEntityProperties = entprop; |
1351 | 1351 | ||
1352 | PositionSanityCheck(true); | 1352 | PositionSanityCheck(true); |