From fc33afddd360843d05f030750b7075315a526ae1 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Mon, 15 Oct 2012 12:11:00 -0700
Subject: BulletSim: remove code in ShapeCollection that hinted at shape
 sharing. Add new function to ParameterDefn for calling BulletSimAPI to set
 values. Tweaking to BSCharacter parameter setting to try and have avatars
 stand.

---
 OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs')

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
             //    just assign to "Position" because of potential call loops.
             BSScene.TaintCallback sanityOperation = delegate()
             {
-                DetailLog("{0},BSPrim.PositionSanityCheck,taint,pos={1},orient={2}", LocalID, _position, _orientation);
+                DetailLog("{0},BSPrim.PositionSanityCheck,taint,pos={1},orient={2}", LocalID, _position, _orientation);
                 ForcePosition = _position;
             };
             if (inTaintTime)
@@ -822,7 +822,7 @@ public sealed class BSPrim : BSPhysObject
         set {
             _buoyancy = value;
             PhysicsScene.TaintedObject("BSPrim.setBuoyancy", delegate()
-            {
+            {
                 ForceBuoyancy = _buoyancy;
             });
         }
@@ -1286,8 +1286,8 @@ public sealed class BSPrim : BSPhysObject
     const float VELOCITY_TOLERANCE = 0.001f;
     const float POSITION_TOLERANCE = 0.05f;
     const float ACCELERATION_TOLERANCE = 0.01f;
-    const float ROTATIONAL_VELOCITY_TOLERANCE = 0.01f;
-
+    const float ROTATIONAL_VELOCITY_TOLERANCE = 0.01f;
+
     public override void UpdateProperties(EntityProperties entprop)
     {
         /*
@@ -1343,10 +1343,10 @@ public sealed class BSPrim : BSPhysObject
             _orientation = entprop.Rotation;
             _velocity = entprop.Velocity;
             _acceleration = entprop.Acceleration;
-            _rotationalVelocity = entprop.RotationalVelocity;
-
-            // remember the current and last set values
-            LastEntityProperties = CurrentEntityProperties;
+            _rotationalVelocity = entprop.RotationalVelocity;
+
+            // remember the current and last set values
+            LastEntityProperties = CurrentEntityProperties;
             CurrentEntityProperties = entprop;
 
             PositionSanityCheck(true);
-- 
cgit v1.1