dr scofield's warnings safari:

* commenting out unused variables

3 files changed, 22 insertions, 21 deletions

diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index 89162a0..7f08cb4 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Region.Physics.OdePlugin
 
         private PhysicsVector _position;
         private d.Vector3 _zeroPosition;
-        private d.Matrix3 m_StandUpRotation;
+        // private d.Matrix3 m_StandUpRotation;
         private bool _zeroFlag = false;
         private bool m_lastUpdateSent = false;
         private PhysicsVector _velocity;
@@ -92,7 +92,7 @@ namespace OpenSim.Region.Physics.OdePlugin
 
         private float m_buoyancy = 0f;
 
-        private CollisionLocker ode;
+        // private CollisionLocker ode;
 
         private string m_name = String.Empty;
 
@@ -120,7 +120,7 @@ namespace OpenSim.Region.Physics.OdePlugin
 
         public OdeCharacter(String avName, OdeScene parent_scene, PhysicsVector pos, CollisionLocker dode, PhysicsVector size, float pid_d, float pid_p, float capsule_radius, float tensor, float density, float height_fudge_factor, float walk_divisor, float rundivisor)
         {
-            ode = dode;
+            // ode = dode;
             _velocity = new PhysicsVector();
             _target_velocity = new PhysicsVector();
             _position = pos;
@@ -137,9 +137,9 @@ namespace OpenSim.Region.Physics.OdePlugin
             runDivisor = rundivisor;
 
 
-            m_StandUpRotation =
-                new d.Matrix3(0.5f, 0.7071068f, 0.5f, -0.7071068f, 0f, 0.7071068f, 0.5f, -0.7071068f,
-                              0.5f);
+            // m_StandUpRotation =
+            //     new d.Matrix3(0.5f, 0.7071068f, 0.5f, -0.7071068f, 0f, 0.7071068f, 0.5f, -0.7071068f,
+            //                   0.5f);
 
             for (int i = 0; i < 11; i++)
             {
@@ -392,7 +392,7 @@ namespace OpenSim.Region.Physics.OdePlugin
 
                     PhysicsVector SetSize = value;
                     float prevCapsule = CAPSULE_LENGTH;
-                    float capsuleradius = CAPSULE_RADIUS;
+                    // float capsuleradius = CAPSULE_RADIUS;
                     //capsuleradius = 0.2f;
 
                     CAPSULE_LENGTH = (SetSize.Z - ((SetSize.Z * heightFudgeFactor))); // subtract 43% of the size
@@ -747,7 +747,8 @@ namespace OpenSim.Region.Physics.OdePlugin
                 {
                     // we're not colliding and we're not flying so that means we're falling!
                     // m_iscolliding includes collisions with the ground.
-                    d.Vector3 pos = d.BodyGetPosition(Body);
+
+                    // d.Vector3 pos = d.BodyGetPosition(Body);
                     if (_target_velocity.X > 0)
                     {
                         vec.X = ((_target_velocity.X - vel.X)/1.2f)*PID_D;
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index 507030b..defc0ca 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Region.Physics.OdePlugin
         private PhysicsVector m_rotationalVelocity;
         private PhysicsVector _size;
         private PhysicsVector _acceleration;
-        private d.Vector3 _zeroPosition = new d.Vector3(0.0f, 0.0f, 0.0f);
+        // private d.Vector3 _zeroPosition = new d.Vector3(0.0f, 0.0f, 0.0f);
         private Quaternion _orientation;
         private PhysicsVector m_taintposition;
         private PhysicsVector m_taintsize;
@@ -1067,8 +1067,8 @@ namespace OpenSim.Region.Physics.OdePlugin
             }
             else
             {
-                string primScenAvatarIn = _parent_scene.whichspaceamIin(_position);
-                int[] arrayitem = _parent_scene.calculateSpaceArrayItemFromPos(_position);
+                // string primScenAvatarIn = _parent_scene.whichspaceamIin(_position);
+                // int[] arrayitem = _parent_scene.calculateSpaceArrayItemFromPos(_position);
                 _parent_scene.waitForSpaceUnlock(m_targetSpace);
 
                 IntPtr tempspace = _parent_scene.recalculateSpaceForGeom(prim_geom, _position, m_targetSpace);
@@ -1141,7 +1141,7 @@ namespace OpenSim.Region.Physics.OdePlugin
                     }
                     //PidStatus = true;
 
-                    PhysicsVector vec = new PhysicsVector();
+                    // PhysicsVector vec = new PhysicsVector();
                     d.Vector3 vel = d.BodyGetLinearVel(Body);
 
                     d.Vector3 pos = d.BodyGetPosition(Body);
@@ -1201,7 +1201,7 @@ namespace OpenSim.Region.Physics.OdePlugin
             }
             else
             {
-                _zeroPosition = d.BodyGetPosition(Body);
+                // _zeroPosition = d.BodyGetPosition(Body);
                 return;
             }
         }
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 876629e..3dd80ea 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -117,7 +117,7 @@ namespace OpenSim.Region.Physics.OdePlugin
     public class OdeScene : PhysicsScene
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        private Dictionary<string, sCollisionData> m_storedCollisions = new Dictionary<string, sCollisionData>();
+        // private Dictionary<string, sCollisionData> m_storedCollisions = new Dictionary<string, sCollisionData>();
 
         CollisionLocker ode;
 
@@ -196,7 +196,7 @@ namespace OpenSim.Region.Physics.OdePlugin
 
         private float[] _watermap;
 
-        private float[] _origheightmap;
+        // private float[] _origheightmap;
 
         private d.NearCallback nearCallback;
         public d.TriCallback triCallback;
@@ -226,7 +226,7 @@ namespace OpenSim.Region.Physics.OdePlugin
 //Ckrinke        private int ms = 0;
         public IntPtr world;
         //private bool returncollisions = false;
-        private uint obj1LocalID = 0;
+        // private uint obj1LocalID = 0;
         private uint obj2LocalID = 0;
         //private int ctype = 0;
         private OdeCharacter cc1;
@@ -501,7 +501,7 @@ namespace OpenSim.Region.Physics.OdePlugin
             IntPtr b1 = d.GeomGetBody(g1);
             IntPtr b2 = d.GeomGetBody(g2);
 
-            d.GeomClassID id = d.GeomGetClass(g1);
+            // d.GeomClassID id = d.GeomGetClass(g1);
 
             String name1 = null;
             String name2 = null;
@@ -837,7 +837,7 @@ namespace OpenSim.Region.Physics.OdePlugin
 
         private void collision_accounting_events(PhysicsActor p1, PhysicsActor p2, float collisiondepth)
         {
-            obj1LocalID = 0;
+            // obj1LocalID = 0;
             //returncollisions = false;
             obj2LocalID = 0;
             //ctype = 0;
@@ -850,7 +850,7 @@ namespace OpenSim.Region.Physics.OdePlugin
                 case ActorTypes.Agent:
                     cc2 = (OdeCharacter)p2;
 
-                        obj1LocalID = cc2.m_localID;
+                        // obj1LocalID = cc2.m_localID;
                         switch ((ActorTypes)p1.PhysicsActorType)
                         {
                             case ActorTypes.Agent:
@@ -893,7 +893,7 @@ namespace OpenSim.Region.Physics.OdePlugin
                 case ActorTypes.Prim:
                     cp2 = (OdePrim)p2;
 
-                        obj1LocalID = cp2.m_localID;
+                        // obj1LocalID = cp2.m_localID;
                         switch ((ActorTypes)p1.PhysicsActorType)
                         {
                             case ActorTypes.Agent:
@@ -2084,7 +2084,7 @@ namespace OpenSim.Region.Physics.OdePlugin
         {
             // this._heightmap[i] = (double)heightMap[i];
             // dbm (danx0r) -- creating a buffer zone of one extra sample all around
-            _origheightmap = heightMap;
+            // _origheightmap = heightMap;
             const uint heightmapWidth = m_regionWidth + 2;
             const uint heightmapHeight = m_regionHeight + 2;
             const uint heightmapWidthSamples = 2*m_regionWidth + 2;