aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/Manager/PhysicsActor.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Physics/Manager/PhysicsActor.cs')
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsActor.cs9
1 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
index f525e9e..1a0c2a7 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
@@ -72,11 +72,13 @@ namespace OpenSim.Region.Physics.Manager
72 { 72 {
73 public float mu; 73 public float mu;
74 public float bounce; 74 public float bounce;
75 public bool softcolide;
75 76
76 public ContactData(float _mu, float _bounce) 77 public ContactData(float _mu, float _bounce, bool _softcolide)
77 { 78 {
78 mu = _mu; 79 mu = _mu;
79 bounce = _bounce; 80 bounce = _bounce;
81 softcolide = _softcolide;
80 } 82 }
81 } 83 }
82 /// <summary> 84 /// <summary>
@@ -158,9 +160,10 @@ namespace OpenSim.Region.Physics.Manager
158 160
159 public virtual bool Building { get; set; } 161 public virtual bool Building { get; set; }
160 162
161 public virtual ContactData ContactData 163 public virtual void getContactData(ref ContactData cdata)
162 { 164 {
163 get { return new ContactData(0, 0); } 165 cdata.mu = 0;
166 cdata.bounce = 0;
164 } 167 }
165 168
166 public abstract bool Stopped { get; } 169 public abstract bool Stopped { get; }