From b378bd33ad772f8c9c3a23ec1b83e168dd748c09 Mon Sep 17 00:00:00 2001 From: Teravus Ovares Date: Sat, 27 Dec 2008 00:17:08 +0000 Subject: * Fixes mantis #2922 * Converts some C# 3.0 syntax into it's 2.0 equivalent so that Visual Studio 2005 can compile it successfully. --- OpenSim/Region/Physics/Manager/PhysicsActor.cs | 4 ++-- OpenSim/Region/Physics/Manager/PhysicsJoint.cs | 16 ++++++++-------- OpenSim/Region/Physics/OdePlugin/OdePhysicsJoint.cs | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs index 3ba5ce5..e7aa9d1 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 String SOPName { get; set; } - public String SOPDescription { get; set; } + public virtual String SOPName { get { return String.Empty; } set { return; } } + public virtual String SOPDescription { get { return String.Empty; } set { return; } } public abstract void CrossingFailure(); diff --git a/OpenSim/Region/Physics/Manager/PhysicsJoint.cs b/OpenSim/Region/Physics/Manager/PhysicsJoint.cs index 52f7e5f..6ef2330 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 PhysicsJointType Type { get; set; } - public string RawParams { get; set; } + public virtual PhysicsJointType Type { get {return ((PhysicsJointType)(-1)); } set { return; } } + public virtual string RawParams { get { return string.Empty; } set { return; } } public List BodyNames = new List(); - public PhysicsVector Position { get; set; } // global coords - public Quaternion Rotation { get; set; } // global coords - public string ObjectNameInScene { get; set; } // proxy object in scene that represents the joint position/orientation - public string TrackedBodyName { get; set; } // body name that this joint is attached to (ObjectNameInScene will follow TrackedBodyName) - public Quaternion LocalRotation { get; set; } // joint orientation relative to one of the involved bodies, the tracked body - public int ErrorMessageCount { get; set; } // total # of error messages printed for this joint since its creation. if too many, further error messages are suppressed to prevent flooding. + 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 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 754ca2b..cfabeee 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 IntPtr jointID { get; set; } + public virtual IntPtr jointID { get { return IntPtr.Zero; } set { return; } } } } -- cgit v1.1