From 01fcd400d7651be5f4aae3547a0489a7ccc5d7f7 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Sun, 4 Mar 2012 04:26:05 +0000
Subject: update UbitOde

---
 OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs')

diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs
index 793e281..94cadb2 100644
--- a/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs
@@ -136,7 +136,8 @@ namespace OpenSim.Region.Physics.OdePlugin
         public UUID m_uuid;
         public bool bad = false;
 
-        public ContactData AvatarContactData = new ContactData(10f, 0.3f);
+        float mu;
+        float bounce;
 
         public OdeCharacter(String avName, OdeScene parent_scene, Vector3 pos, Vector3 size, float pid_d, float pid_p, float capsule_radius, float density, float walk_divisor, float rundivisor)
         {
@@ -168,8 +169,8 @@ namespace OpenSim.Region.Physics.OdePlugin
             m_density = density;
             m_mass = 80f; // sure we have a default
 
-            AvatarContactData.mu = parent_scene.AvatarFriction;
-            AvatarContactData.bounce = parent_scene.AvatarBounce;
+            mu = parent_scene.AvatarFriction;
+            bounce = parent_scene.AvatarBounce;
 
             walkDivisor = walk_divisor;
             runDivisor = rundivisor;
@@ -190,9 +191,10 @@ namespace OpenSim.Region.Physics.OdePlugin
             set { return; }
         }
 
-        public override ContactData ContactData
+        public override void getContactData(ref ContactData cdata)
         {
-            get { return AvatarContactData; }
+            cdata.mu = mu;
+            cdata.bounce = bounce;
         }
 
         public override bool Building { get; set; }
-- 
cgit v1.1