diff options
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin')
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs index 36dead0..6963af5 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | |||
@@ -765,6 +765,9 @@ public class BSScene : PhysicsScene, IPhysicsParameters | |||
765 | new PhysParameterEntry("Friction", "Set friction parameter for a specific object" ), | 765 | new PhysParameterEntry("Friction", "Set friction parameter for a specific object" ), |
766 | new PhysParameterEntry("Restitution", "Set restitution parameter for a specific object" ), | 766 | new PhysParameterEntry("Restitution", "Set restitution parameter for a specific object" ), |
767 | 767 | ||
768 | new PhysParameterEntry("Friction", "Set friction parameter for a specific object" ), | ||
769 | new PhysParameterEntry("Restitution", "Set restitution parameter for a specific object" ), | ||
770 | |||
768 | new PhysParameterEntry("TerrainFriction", "Factor to reduce movement against terrain surface" ), | 771 | new PhysParameterEntry("TerrainFriction", "Factor to reduce movement against terrain surface" ), |
769 | new PhysParameterEntry("TerrainHitFraction", "Distance to measure hit collisions" ), | 772 | new PhysParameterEntry("TerrainHitFraction", "Distance to measure hit collisions" ), |
770 | new PhysParameterEntry("TerrainRestitution", "Bouncyness" ), | 773 | new PhysParameterEntry("TerrainRestitution", "Bouncyness" ), |
@@ -808,7 +811,6 @@ public class BSScene : PhysicsScene, IPhysicsParameters | |||
808 | case "defaultdensity": m_params[0].defaultDensity = val; break; | 811 | case "defaultdensity": m_params[0].defaultDensity = val; break; |
809 | case "defaultrestitution": m_params[0].defaultRestitution = val; break; | 812 | case "defaultrestitution": m_params[0].defaultRestitution = val; break; |
810 | case "collisionmargin": m_params[0].collisionMargin = val; break; | 813 | case "collisionmargin": m_params[0].collisionMargin = val; break; |
811 | |||
812 | case "gravity": m_params[0].gravity = val; TaintedUpdateParameter(lparm, localID, val); break; | 814 | case "gravity": m_params[0].gravity = val; TaintedUpdateParameter(lparm, localID, val); break; |
813 | 815 | ||
814 | case "lineardamping": UpdateParameterPrims(ref m_params[0].linearDamping, lparm, localID, val); break; | 816 | case "lineardamping": UpdateParameterPrims(ref m_params[0].linearDamping, lparm, localID, val); break; |
@@ -831,6 +833,9 @@ public class BSScene : PhysicsScene, IPhysicsParameters | |||
831 | case "friction": TaintedUpdateParameter(lparm, localID, val); break; | 833 | case "friction": TaintedUpdateParameter(lparm, localID, val); break; |
832 | case "restitution": TaintedUpdateParameter(lparm, localID, val); break; | 834 | case "restitution": TaintedUpdateParameter(lparm, localID, val); break; |
833 | 835 | ||
836 | case "friction": TaintedUpdateParameter(lparm, localID, val); break; | ||
837 | case "restitution": TaintedUpdateParameter(lparm, localID, val); break; | ||
838 | |||
834 | // set a terrain physical feature and cause terrain to be recalculated | 839 | // set a terrain physical feature and cause terrain to be recalculated |
835 | case "terrainfriction": m_params[0].terrainFriction = val; TaintedUpdateParameter("terrain", 0, val); break; | 840 | case "terrainfriction": m_params[0].terrainFriction = val; TaintedUpdateParameter("terrain", 0, val); break; |
836 | case "terrainhitfraction": m_params[0].terrainHitFraction = val; TaintedUpdateParameter("terrain", 0, val); break; | 841 | case "terrainhitfraction": m_params[0].terrainHitFraction = val; TaintedUpdateParameter("terrain", 0, val); break; |