aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs
diff options
context:
space:
mode:
authorMelanie2012-11-04 22:44:42 +0000
committerMelanie2012-11-04 22:44:42 +0000
commitc623e358057a9222e872ef648d847dfeb67852aa (patch)
tree63f474d313e78de31e9ec8b937912e18390903ff /OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs
parentMerge branch 'avination' into careminster (diff)
parentAdd a method to query all registered script constants to allow non-XEngine (diff)
downloadopensim-SC_OLD-c623e358057a9222e872ef648d847dfeb67852aa.zip
opensim-SC_OLD-c623e358057a9222e872ef648d847dfeb67852aa.tar.gz
opensim-SC_OLD-c623e358057a9222e872ef648d847dfeb67852aa.tar.bz2
opensim-SC_OLD-c623e358057a9222e872ef648d847dfeb67852aa.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs')
-rwxr-xr-xOpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs12
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs b/OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs
index f017cdd..65fac00 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs
@@ -42,6 +42,12 @@ public abstract class BSConstraint : IDisposable
42 protected BulletConstraint m_constraint; 42 protected BulletConstraint m_constraint;
43 protected bool m_enabled = false; 43 protected bool m_enabled = false;
44 44
45 public BulletBody Body1 { get { return m_body1; } }
46 public BulletBody Body2 { get { return m_body2; } }
47 public BulletConstraint Constraint { get { return m_constraint; } }
48 public abstract ConstraintType Type { get; }
49 public bool IsEnabled { get { return m_enabled; } }
50
45 public BSConstraint() 51 public BSConstraint()
46 { 52 {
47 } 53 }
@@ -64,12 +70,6 @@ public abstract class BSConstraint : IDisposable
64 } 70 }
65 } 71 }
66 72
67 public BulletBody Body1 { get { return m_body1; } }
68 public BulletBody Body2 { get { return m_body2; } }
69 public BulletConstraint Constraint { get { return m_constraint; } }
70 public abstract ConstraintType Type { get; }
71
72
73 public virtual bool SetLinearLimits(Vector3 low, Vector3 high) 73 public virtual bool SetLinearLimits(Vector3 low, Vector3 high)
74 { 74 {
75 bool ret = false; 75 bool ret = false;