diff options
| author | Robert Adams | 2012-03-26 08:57:40 -0700 |
|---|---|---|
| committer | Robert Adams | 2012-03-26 08:57:40 -0700 |
| commit | 2fcdecf0900a5b458227ede4b34faec427f3cf28 (patch) | |
| tree | 27b9fae37ce4d8f05712bc774d707e3dcc7d9848 /OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | |
| parent | Merge branch 'bulletsim1' (diff) | |
| download | opensim-SC_OLD-2fcdecf0900a5b458227ede4b34faec427f3cf28.zip opensim-SC_OLD-2fcdecf0900a5b458227ede4b34faec427f3cf28.tar.gz opensim-SC_OLD-2fcdecf0900a5b458227ede4b34faec427f3cf28.tar.bz2 opensim-SC_OLD-2fcdecf0900a5b458227ede4b34faec427f3cf28.tar.xz | |
BulletSim: fix typo introducted by previous checkins (git merge sometimes makes mistakes)
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs index 6963af5..581d540 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | |||
| @@ -833,9 +833,6 @@ public class BSScene : PhysicsScene, IPhysicsParameters | |||
| 833 | case "friction": TaintedUpdateParameter(lparm, localID, val); break; | 833 | case "friction": TaintedUpdateParameter(lparm, localID, val); break; |
| 834 | case "restitution": TaintedUpdateParameter(lparm, localID, val); break; | 834 | case "restitution": TaintedUpdateParameter(lparm, localID, val); break; |
| 835 | 835 | ||
| 836 | case "friction": TaintedUpdateParameter(lparm, localID, val); break; | ||
| 837 | case "restitution": TaintedUpdateParameter(lparm, localID, val); break; | ||
| 838 | |||
| 839 | // set a terrain physical feature and cause terrain to be recalculated | 836 | // set a terrain physical feature and cause terrain to be recalculated |
| 840 | case "terrainfriction": m_params[0].terrainFriction = val; TaintedUpdateParameter("terrain", 0, val); break; | 837 | case "terrainfriction": m_params[0].terrainFriction = val; TaintedUpdateParameter("terrain", 0, val); break; |
| 841 | case "terrainhitfraction": m_params[0].terrainHitFraction = val; TaintedUpdateParameter("terrain", 0, val); break; | 838 | case "terrainhitfraction": m_params[0].terrainHitFraction = val; TaintedUpdateParameter("terrain", 0, val); break; |