* More NINJA Joint physics fixes from nlin.

fixes mantis #2874

3 files changed, 11 insertions, 11 deletions

diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
index e7aa9d1..0f75c46 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
@@ -127,8 +127,8 @@ namespace OpenSim.Region.Physics.Manager
 
         public abstract bool Selected { set; }
 
-        public virtual String SOPName { get { return String.Empty; } set { return; } }
-        public virtual String SOPDescription { get { return String.Empty; } set { return; } }
+        public string SOPName;
+        public string SOPDescription;
 
         public abstract void CrossingFailure();
 
diff --git a/OpenSim/Region/Physics/Manager/PhysicsJoint.cs b/OpenSim/Region/Physics/Manager/PhysicsJoint.cs
index 6ef2330..9ef1c84 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsJoint.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsJoint.cs
@@ -41,15 +41,15 @@ namespace OpenSim.Region.Physics.Manager
     public class PhysicsJoint

     {

         public virtual bool IsInPhysicsEngine { get { return false; } } // set internally to indicate if this joint has already been passed to the physics engine or is still pending

-        public virtual PhysicsJointType Type { get {return ((PhysicsJointType)(-1)); } set { return; } }

-        public virtual string RawParams { get { return string.Empty; } set { return; } }

+        public PhysicsJointType Type;

+        public string RawParams;

         public List<string> BodyNames = new List<string>();

-        public virtual PhysicsVector Position { get { return PhysicsVector.Zero; } set { return; } } // global coords

-        public virtual Quaternion Rotation { get { return Quaternion.Identity; } set { return; } } // global coords

-        public virtual string ObjectNameInScene { get { return string.Empty; } set { return; } } // proxy object in scene that represents the joint position/orientation

-        public virtual string TrackedBodyName { get { return string.Empty; } set { return; } } // body name that this joint is attached to (ObjectNameInScene will follow TrackedBodyName)

-        public virtual Quaternion LocalRotation { get { return Quaternion.Identity; } set { return; } } // joint orientation relative to one of the involved bodies, the tracked body

-        public virtual int ErrorMessageCount { get { return 0; } set { return; } } // total # of error messages printed for this joint since its creation. if too many, further error messages are suppressed to prevent flooding.

+        public PhysicsVector Position; // global coords

+        public Quaternion Rotation; // global coords

+        public string ObjectNameInScene; // proxy object in scene that represents the joint position/orientation

+        public string TrackedBodyName; // body name that this joint is attached to (ObjectNameInScene will follow TrackedBodyName)

+        public Quaternion LocalRotation; // joint orientation relative to one of the involved bodies, the tracked body

+        public int ErrorMessageCount; // total # of error messages printed for this joint since its creation. if too many, further error messages are suppressed to prevent flooding.

         public const int maxErrorMessages = 100; // no more than this # of error messages will be printed for each joint

     }

 }

diff --git a/OpenSim/Region/Physics/OdePlugin/OdePhysicsJoint.cs b/OpenSim/Region/Physics/OdePlugin/OdePhysicsJoint.cs
index cfabeee..d080e9b 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePhysicsJoint.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePhysicsJoint.cs
@@ -44,6 +44,6 @@ namespace OpenSim.Region.Physics.OdePlugin
                 return (jointID != IntPtr.Zero);

             }

         }

-        public virtual IntPtr jointID { get { return IntPtr.Zero; } set { return; } }

+        public IntPtr jointID;

     }

 }