aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics
diff options
context:
space:
mode:
authorTeravus Ovares2008-12-28 16:30:00 +0000
committerTeravus Ovares2008-12-28 16:30:00 +0000
commit6eed7fcd1edcb3d4613982a51d6a21540a5cf67d (patch)
tree4d458b661854194d79a82587ec9849af13991ea5 /OpenSim/Region/Physics
parent* Eliminate a possible null reference from the LLSDLogin method. (diff)
downloadopensim-SC_OLD-6eed7fcd1edcb3d4613982a51d6a21540a5cf67d.zip
opensim-SC_OLD-6eed7fcd1edcb3d4613982a51d6a21540a5cf67d.tar.gz
opensim-SC_OLD-6eed7fcd1edcb3d4613982a51d6a21540a5cf67d.tar.bz2
opensim-SC_OLD-6eed7fcd1edcb3d4613982a51d6a21540a5cf67d.tar.xz
* More NINJA Joint physics fixes from nlin.
fixes mantis #2874
Diffstat (limited to 'OpenSim/Region/Physics')
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsActor.cs4
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsJoint.cs16
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdePhysicsJoint.cs2
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
127 127
128 public abstract bool Selected { set; } 128 public abstract bool Selected { set; }
129 129
130 public virtual String SOPName { get { return String.Empty; } set { return; } } 130 public string SOPName;
131 public virtual String SOPDescription { get { return String.Empty; } set { return; } } 131 public string SOPDescription;
132 132
133 public abstract void CrossingFailure(); 133 public abstract void CrossingFailure();
134 134
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
41 public class PhysicsJoint 41 public class PhysicsJoint
42 { 42 {
43 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 43 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
44 public virtual PhysicsJointType Type { get {return ((PhysicsJointType)(-1)); } set { return; } } 44 public PhysicsJointType Type;
45 public virtual string RawParams { get { return string.Empty; } set { return; } } 45 public string RawParams;
46 public List<string> BodyNames = new List<string>(); 46 public List<string> BodyNames = new List<string>();
47 public virtual PhysicsVector Position { get { return PhysicsVector.Zero; } set { return; } } // global coords 47 public PhysicsVector Position; // global coords
48 public virtual Quaternion Rotation { get { return Quaternion.Identity; } set { return; } } // global coords 48 public Quaternion Rotation; // global coords
49 public virtual string ObjectNameInScene { get { return string.Empty; } set { return; } } // proxy object in scene that represents the joint position/orientation 49 public string ObjectNameInScene; // proxy object in scene that represents the joint position/orientation
50 public virtual string TrackedBodyName { get { return string.Empty; } set { return; } } // body name that this joint is attached to (ObjectNameInScene will follow TrackedBodyName) 50 public string TrackedBodyName; // body name that this joint is attached to (ObjectNameInScene will follow TrackedBodyName)
51 public virtual Quaternion LocalRotation { get { return Quaternion.Identity; } set { return; } } // joint orientation relative to one of the involved bodies, the tracked body 51 public Quaternion LocalRotation; // joint orientation relative to one of the involved bodies, the tracked body
52 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. 52 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.
53 public const int maxErrorMessages = 100; // no more than this # of error messages will be printed for each joint 53 public const int maxErrorMessages = 100; // no more than this # of error messages will be printed for each joint
54 } 54 }
55} 55}
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
44 return (jointID != IntPtr.Zero); 44 return (jointID != IntPtr.Zero);
45 } 45 }
46 } 46 }
47 public virtual IntPtr jointID { get { return IntPtr.Zero; } set { return; } } 47 public IntPtr jointID;
48 } 48 }
49} 49}