cleaning out warnings.

NOTE: we currently have a gazillion warnings caused stuff flagged as
"obsolete" (OGS1 stuff) --- what's up with that?

3 files changed, 32 insertions, 32 deletions

diff --git a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs
index c0a016e..8da9687 100644
--- a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs
+++ b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs
@@ -60,7 +60,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
         private btQuaternion m_bodyOrientation;
         private btDefaultMotionState m_bodyMotionState;
         private btGeneric6DofConstraint m_aMotor;
-        private PhysicsVector m_movementComparision;
+        // private PhysicsVector m_movementComparision;
         private PhysicsVector m_position;
         private PhysicsVector m_zeroPosition;
         private bool m_zeroFlag = false;
@@ -95,15 +95,15 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
         public bool m_tainted_isPhysical = false; // set when the physical status is tainted (false=not existing in physics engine, true=existing)
         private float m_tainted_CAPSULE_LENGTH; // set when the capsule length changes. 
         private bool m_taintRemove = false;
-        private bool m_taintedPosition = false;
-        private PhysicsVector m_taintedPosition_value;
+        // private bool m_taintedPosition = false;
+        // private PhysicsVector m_taintedPosition_value;
         private PhysicsVector m_taintedForce;
 
         private float m_buoyancy = 0f;
 
         // private CollisionLocker ode;
 
-        private string m_name = String.Empty;
+        // private string m_name = String.Empty;
 
         private bool[] m_colliderarr = new bool[11];
         private bool[] m_colliderGroundarr = new bool[11];
@@ -113,7 +113,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
         private BulletDotNETScene m_parent_scene;
 
         public int m_eventsubscription = 0;
-        private CollisionEventUpdate CollisionEventsThisFrame = new CollisionEventUpdate();
+        // private CollisionEventUpdate CollisionEventsThisFrame = new CollisionEventUpdate();
 
         public BulletDotNETCharacter(string avName, BulletDotNETScene parent_scene, PhysicsVector pos, PhysicsVector size, float pid_d, float pid_p, float capsule_radius, float tensor, float density, float height_fudge_factor, float walk_divisor, float rundivisor)
         {
@@ -147,7 +147,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
 
             m_parent_scene.AddPhysicsActorTaint(this);
             
-            m_name = avName;
+            // m_name = avName;
             tempVector1 = new btVector3(0, 0, 0);
             tempVector2 = new btVector3(0, 0, 0);
             tempVector3 = new btVector3(0, 0, 0);
@@ -159,7 +159,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
 
             tempQuat1 = new btQuaternion(0, 0, 0, 1);
             tempTrans1 = new btTransform(tempQuat1, tempVector1);
-            m_movementComparision = new PhysicsVector(0, 0, 0);
+            // m_movementComparision = new PhysicsVector(0, 0, 0);
             m_CapsuleOrientationAxis = new btVector3(1, 0, 1);
             
             
@@ -327,9 +327,9 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
             get { return m_position; }
             set
             {
-                m_taintedPosition_value = value;
+                // m_taintedPosition_value = value;
                 m_position = value;
-                m_taintedPosition = true;
+                // m_taintedPosition = true;
             }
         }
 
@@ -772,7 +772,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
 
                     tempQuat1 = new btQuaternion(0, 0, 0, 1);
                     tempTrans1 = new btTransform(tempQuat1, tempVector1);
-                    m_movementComparision = new PhysicsVector(0, 0, 0);
+                    // m_movementComparision = new PhysicsVector(0, 0, 0);
                     m_CapsuleOrientationAxis = new btVector3(1, 0, 1);
                 }
 
@@ -803,7 +803,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
 
                     tempQuat1 = new btQuaternion(0, 0, 0, 1);
                     tempTrans1 = new btTransform(tempQuat1, tempVector1);
-                    m_movementComparision = new PhysicsVector(0, 0, 0);
+                    // m_movementComparision = new PhysicsVector(0, 0, 0);
                     m_CapsuleOrientationAxis = new btVector3(1, 0, 1);
 
                     AvatarGeomAndBodyCreation(m_position.X, m_position.Y,
diff --git a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs
index ec982c6..0d61f72 100644
--- a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs
+++ b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs
@@ -62,7 +62,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
         private Quaternion m_taintrot;
         private PhysicsVector m_angularlock = new PhysicsVector(1f, 1f, 1f);
         private PhysicsVector m_taintAngularLock = new PhysicsVector(1f, 1f, 1f);
-        private btGeneric6DofConstraint Amotor;
+        // private btGeneric6DofConstraint Amotor;
 
         private PhysicsVector m_PIDTarget = new PhysicsVector(0, 0, 0);
         private float m_PIDTau = 0f;
@@ -75,8 +75,8 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
         private float m_waterHeight = 0f;
         private float PID_D = 35f;
         private float PID_G = 25f;
-        private float m_tensor = 5f;
-        private int body_autodisable_frames = 20;
+        // private float m_tensor = 5f;
+        // private int body_autodisable_frames = 20;
         private IMesh primMesh = null;
 
         private bool m_usePID = false;
@@ -90,15 +90,15 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
 
         private bool m_taintshape = false;
         private bool m_taintPhysics = false;
-        private bool m_collidesLand = true;
+        // private bool m_collidesLand = true;
         private bool m_collidesWater = false;
         public bool m_returnCollisions = false;
 
         // Default we're a Geometry
-        private CollisionCategories m_collisionCategories = (CollisionCategories.Geom);
+        // private CollisionCategories m_collisionCategories = (CollisionCategories.Geom);
 
         // Default, Collide with Other Geometries, spaces and Bodies
-        private CollisionCategories m_collisionFlags = m_default_collisionFlags;
+        // private CollisionCategories m_collisionFlags = m_default_collisionFlags;
 
         public bool m_taintremove = false;
         public bool m_taintdisable = false;
@@ -110,7 +110,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
         public uint m_localID = 0;
 
         //public GCHandle gc;
-        private CollisionLocker ode;
+        // private CollisionLocker ode;
 
         private bool m_taintforce = false;
         private bool m_taintaddangularforce = false;
@@ -136,7 +136,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
         internal bool m_isVolumeDetect = false; // If true, this prim only detects collisions but doesn't collide actively
 
         private bool m_throttleUpdates = false;
-        private int throttleCounter = 0;
+        // private int throttleCounter = 0;
         public int m_interpenetrationcount = 0;
         public float m_collisionscore = 0;
         public int m_roundsUnderMotionThreshold = 0;
@@ -155,7 +155,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
         private PhysicsVector _target_velocity;
 
         public int m_eventsubscription = 0;
-        private CollisionEventUpdate CollisionEventsThisFrame = null;
+        // private CollisionEventUpdate CollisionEventsThisFrame = null;
 
         public volatile bool childPrim = false;
 
@@ -226,8 +226,8 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
             PID_D = parent_scene.bodyPIDD;
             PID_G = parent_scene.bodyPIDG;
             m_density = parent_scene.geomDefaultDensity;
-            m_tensor = parent_scene.bodyMotorJointMaxforceTensor;
-            body_autodisable_frames = parent_scene.bodyFramesAutoDisable;
+            // m_tensor = parent_scene.bodyMotorJointMaxforceTensor;
+            // body_autodisable_frames = parent_scene.bodyFramesAutoDisable;
 
             prim_geom = null;
             Body = null;
@@ -2146,7 +2146,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
             }
             else
             {
-                bool hasTrimesh = false;
+                // bool hasTrimesh = false;
                 lock (childrenPrim)
                 {
                     foreach (BulletDotNETPrim chld in childrenPrim)
@@ -2154,8 +2154,8 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
                         if (chld == null)
                             continue;
                         
-                        if (chld.NeedsMeshing())
-                            hasTrimesh = true;
+                        // if (chld.NeedsMeshing())
+                        //     hasTrimesh = true;
                     }
                 }
 
@@ -2517,7 +2517,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
                             base.RequestPhysicsterseUpdate();
 
                         m_throttleUpdates = false;
-                        throttleCounter = 0;
+                        // throttleCounter = 0;
                         _zeroFlag = true;
                         //outofBounds = true;
                     }
@@ -2556,7 +2556,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
                         if (!m_lastUpdateSent)
                         {
                             m_throttleUpdates = false;
-                            throttleCounter = 0;
+                            // throttleCounter = 0;
                             m_rotationalVelocity = pv;
 
                             if (_parent == null)
diff --git a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs
index 0a375b2..f006cf1 100644
--- a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs
+++ b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        private string m_sceneIdentifier = string.Empty;
+        // private string m_sceneIdentifier = string.Empty;
         
         private List<BulletDotNETCharacter> m_characters = new List<BulletDotNETCharacter>();
         private List<BulletDotNETPrim> m_prims = new List<BulletDotNETPrim>();
@@ -76,7 +76,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
         private float avMovementDivisorWalk = 1.8f;
         private float avMovementDivisorRun = 0.8f;
 
-        private float minimumGroundFlightOffset = 3f;
+        // private float minimumGroundFlightOffset = 3f;
 
         public bool meshSculptedPrim = true;
 
@@ -98,7 +98,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
         private float[] _origheightmap;    // Used for Fly height. Kitto Flora
         private bool usingGImpactAlgorithm = false;
 
-        private IConfigSource m_config;
+        // private IConfigSource m_config;
         private readonly btVector3 worldAabbMin = new btVector3(-10f, -10f, 0);
         private readonly btVector3 worldAabbMax = new btVector3((int)Constants.RegionSize + 10f, (int)Constants.RegionSize + 10f, 9000);
 
@@ -107,7 +107,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
 
         public BulletDotNETScene(string sceneIdentifier)
         {
-            m_sceneIdentifier = sceneIdentifier;
+            // m_sceneIdentifier = sceneIdentifier;
             VectorZero = new btVector3(0, 0, 0);
             QuatIdentity = new btQuaternion(0, 0, 0, 1);
             TransZero = new btTransform(QuatIdentity, VectorZero);
@@ -119,7 +119,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
         public override void Initialise(IMesher meshmerizer, IConfigSource config)
         {
             mesher = meshmerizer;
-            m_config = config;
+            // m_config = config;
             /*
             if (Environment.OSVersion.Platform == PlatformID.Unix)
             {