Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster

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
     {
         public float mu;
         public float bounce;
+        public bool softcolide;
 
-        public ContactData(float _mu, float _bounce)
+        public ContactData(float _mu, float _bounce, bool _softcolide)
         {
             mu = _mu;
             bounce = _bounce;
+            softcolide = _softcolide;
         }
     }
     /// <summary>
@@ -158,9 +160,10 @@ namespace OpenSim.Region.Physics.Manager
    
         public virtual bool Building { get; set; }
 
-        public virtual ContactData ContactData
+        public virtual void getContactData(ref ContactData cdata)
         {
-            get { return new ContactData(0, 0); }
+            cdata.mu = 0;
+            cdata.bounce = 0;
         }
 
         public abstract bool Stopped { get; }