4 files changed, 62 insertions, 60 deletions

diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index 48a1c0e..ce46dae 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -59,35 +59,36 @@ namespace OpenSim.Region.Physics.Meshing
         //        const string baseDir = "rawFiles";
         private const string baseDir = null; //"rawFiles";
 
-        private static void IntersectionParameterPD(PhysicsVector p1, PhysicsVector r1, PhysicsVector p2,
-                                                    PhysicsVector r2, ref float lambda, ref float mu)
-        {
-            // p1, p2, points on the straight
-            // r1, r2, directional vectors of the straight. Not necessarily of length 1!
-            // note, that l, m can be scaled such, that the range 0..1 is mapped to the area between two points,
-            // thus allowing to decide whether an intersection is between two points
-
-            float r1x = r1.X;
-            float r1y = r1.Y;
-            float r2x = r2.X;
-            float r2y = r2.Y;
-
-            float denom = r1y*r2x - r1x*r2y;
-
-            if (denom == 0.0)
-            {
-                lambda = Single.NaN;
-                mu = Single.NaN;
-                return;
-            }
-
-            float p1x = p1.X;
-            float p1y = p1.Y;
-            float p2x = p2.X;
-            float p2y = p2.Y;
-            lambda = (-p2x*r2y + p1x*r2y + (p2y - p1y)*r2x)/denom;
-            mu = (-p2x*r1y + p1x*r1y + (p2y - p1y)*r1x)/denom;
-        }
+// TODO: unused
+//         private static void IntersectionParameterPD(PhysicsVector p1, PhysicsVector r1, PhysicsVector p2,
+//                                                     PhysicsVector r2, ref float lambda, ref float mu)
+//         {
+//             // p1, p2, points on the straight
+//             // r1, r2, directional vectors of the straight. Not necessarily of length 1!
+//             // note, that l, m can be scaled such, that the range 0..1 is mapped to the area between two points,
+//             // thus allowing to decide whether an intersection is between two points
+
+//             float r1x = r1.X;
+//             float r1y = r1.Y;
+//             float r2x = r2.X;
+//             float r2y = r2.Y;
+
+//             float denom = r1y*r2x - r1x*r2y;
+
+//             if (denom == 0.0)
+//             {
+//                 lambda = Single.NaN;
+//                 mu = Single.NaN;
+//                 return;
+//             }
+
+//             float p1x = p1.X;
+//             float p1y = p1.Y;
+//             float p2x = p2.X;
+//             float p2y = p2.Y;
+//             lambda = (-p2x*r2y + p1x*r2y + (p2y - p1y)*r2x)/denom;
+//             mu = (-p2x*r1y + p1x*r1y + (p2y - p1y)*r1x)/denom;
+//         }
 
         private static List<Triangle> FindInfluencedTriangles(List<Triangle> triangles, Vertex v)
         {
diff --git a/OpenSim/Region/Physics/Meshing/SimpleHull.cs b/OpenSim/Region/Physics/Meshing/SimpleHull.cs
index 3d3f42c..c518b78 100644
--- a/OpenSim/Region/Physics/Meshing/SimpleHull.cs
+++ b/OpenSim/Region/Physics/Meshing/SimpleHull.cs
@@ -170,11 +170,12 @@ namespace OpenSim.Region.Physics.Meshing
             return result;
         }
 
-        private bool InsertVertex(Vertex v, int iAfter)
-        {
-            vertices.Insert(iAfter + 1, v);
-            return true;
-        }
+// TODO: unused
+//         private bool InsertVertex(Vertex v, int iAfter)
+//         {
+//             vertices.Insert(iAfter + 1, v);
+//             return true;
+//         }
 
         private Vertex getNextVertex(Vertex currentVertex)
         {
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index b870a77..62978fd 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -504,26 +504,27 @@ namespace OpenSim.Region.Physics.OdePlugin
         {
 
         }
-        private void standupStraight()
-        {
-
-            // The purpose of this routine here is to quickly stabilize the Body while it's popped up in the air.
-            // The amotor needs a few seconds to stabilize so without it, the avatar shoots up sky high when you 
-            // change appearance and when you enter the simulator
-            // After this routine is done, the amotor stabilizes much quicker
-            d.Vector3 feet;
-            d.Vector3 head;
-            d.BodyGetRelPointPos(Body, 0.0f, 0.0f, -1.0f, out feet);
-            d.BodyGetRelPointPos(Body, 0.0f, 0.0f, 1.0f, out head);
-            float posture = head.Z - feet.Z;
-
-            // restoring force proportional to lack of posture:
-            float servo = (2.5f - posture) * POSTURE_SERVO;
-            d.BodyAddForceAtRelPos(Body, 0.0f, 0.0f, servo, 0.0f, 0.0f, 1.0f);
-            d.BodyAddForceAtRelPos(Body, 0.0f, 0.0f, -servo, 0.0f, 0.0f, -1.0f);
-            //d.Matrix3 bodyrotation = d.BodyGetRotation(Body);
-            //m_log.Info("[PHYSICSAV]: Rotation: " + bodyrotation.M00 + " : " + bodyrotation.M01 + " : " + bodyrotation.M02 + " : " + bodyrotation.M10 + " : " + bodyrotation.M11 + " : " + bodyrotation.M12 + " : " + bodyrotation.M20 + " : " + bodyrotation.M21 + " : " + bodyrotation.M22);
-        }
+
+// TODO: unused:
+//         private void standupStraight()
+//         {
+//             // The purpose of this routine here is to quickly stabilize the Body while it's popped up in the air.
+//             // The amotor needs a few seconds to stabilize so without it, the avatar shoots up sky high when you 
+//             // change appearance and when you enter the simulator
+//             // After this routine is done, the amotor stabilizes much quicker
+//             d.Vector3 feet;
+//             d.Vector3 head;
+//             d.BodyGetRelPointPos(Body, 0.0f, 0.0f, -1.0f, out feet);
+//             d.BodyGetRelPointPos(Body, 0.0f, 0.0f, 1.0f, out head);
+//             float posture = head.Z - feet.Z;
+
+//             // restoring force proportional to lack of posture:
+//             float servo = (2.5f - posture) * POSTURE_SERVO;
+//             d.BodyAddForceAtRelPos(Body, 0.0f, 0.0f, servo, 0.0f, 0.0f, 1.0f);
+//             d.BodyAddForceAtRelPos(Body, 0.0f, 0.0f, -servo, 0.0f, 0.0f, -1.0f);
+//             //d.Matrix3 bodyrotation = d.BodyGetRotation(Body);
+//             //m_log.Info("[PHYSICSAV]: Rotation: " + bodyrotation.M00 + " : " + bodyrotation.M01 + " : " + bodyrotation.M02 + " : " + bodyrotation.M10 + " : " + bodyrotation.M11 + " : " + bodyrotation.M12 + " : " + bodyrotation.M20 + " : " + bodyrotation.M21 + " : " + bodyrotation.M22);
+//         }
 
         public override PhysicsVector Force
         {
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index abac967..8529234 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -981,12 +981,11 @@ namespace OpenSim.Region.Physics.OdePlugin
 
         #endregion
 
-        private float GetTerrainHeightAtXY(float x, float y)
-        {
-            return (float)_origheightmap[(int)y * Constants.RegionSize + (int)x];
-
-
-        }
+// TODO: unused
+//         private float GetTerrainHeightAtXY(float x, float y)
+//         {
+//             return (float)_origheightmap[(int)y * Constants.RegionSize + (int)x];
+//         }
 
         #region Add/Remove Entities