aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs11
1 files changed, 6 insertions, 5 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
index 76d7746..3fc2de3 100644
--- a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
+++ b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
@@ -169,7 +169,6 @@ namespace OpenSim.Region.Physics.OdePlugin
169 float TerrainBounce = 0.1f; 169 float TerrainBounce = 0.1f;
170 float TerrainFriction = 0.3f; 170 float TerrainFriction = 0.3f;
171 171
172 public float AvatarBounce = 0.3f;
173 public float AvatarFriction = 0;// 0.9f * 0.5f; 172 public float AvatarFriction = 0;// 0.9f * 0.5f;
174 173
175 private const uint m_regionWidth = Constants.RegionSize; 174 private const uint m_regionWidth = Constants.RegionSize;
@@ -711,8 +710,8 @@ namespace OpenSim.Region.Physics.OdePlugin
711 case (int)ActorTypes.Agent: 710 case (int)ActorTypes.Agent:
712 p1.getContactData(ref contactdata1); 711 p1.getContactData(ref contactdata1);
713 p2.getContactData(ref contactdata2); 712 p2.getContactData(ref contactdata2);
714 713
715 bounce = contactdata1.bounce * contactdata2.bounce; 714 bounce = 0;
716 715
717 mu = (float)Math.Sqrt(contactdata1.mu * contactdata2.mu); 716 mu = (float)Math.Sqrt(contactdata1.mu * contactdata2.mu);
718 717
@@ -726,7 +725,8 @@ namespace OpenSim.Region.Physics.OdePlugin
726 case (int)ActorTypes.Prim: 725 case (int)ActorTypes.Prim:
727 p1.getContactData(ref contactdata1); 726 p1.getContactData(ref contactdata1);
728 p2.getContactData(ref contactdata2); 727 p2.getContactData(ref contactdata2);
729 bounce = contactdata1.bounce * contactdata2.bounce; 728
729 bounce = 0;
730 730
731 mu = (float)Math.Sqrt(contactdata1.mu * contactdata2.mu); 731 mu = (float)Math.Sqrt(contactdata1.mu * contactdata2.mu);
732 732
@@ -751,7 +751,8 @@ namespace OpenSim.Region.Physics.OdePlugin
751 case (int)ActorTypes.Agent: 751 case (int)ActorTypes.Agent:
752 p1.getContactData(ref contactdata1); 752 p1.getContactData(ref contactdata1);
753 p2.getContactData(ref contactdata2); 753 p2.getContactData(ref contactdata2);
754 bounce = contactdata1.bounce * contactdata2.bounce; 754
755 bounce = 0;
755 756
756 mu = (float)Math.Sqrt(contactdata1.mu * contactdata2.mu); 757 mu = (float)Math.Sqrt(contactdata1.mu * contactdata2.mu);
757 758