Merge branch 'master' into careminster

author: Melanie 2012-12-23 18:05:17 +0000
committer: Melanie 2012-12-23 18:05:17 +0000
commit: a126097d6be209ba4e30b5573195c04bcf2d8c1e (patch)
tree: bce8220f560827a332155ca84e16de94677ca235 /OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs
parent: Merge branch 'avination' into careminster (diff)
parent: BulletSim: modify avatar motor code to make falling movement better. Clean up... (diff)
download: opensim-SC-a126097d6be209ba4e30b5573195c04bcf2d8c1e.zip
opensim-SC-a126097d6be209ba4e30b5573195c04bcf2d8c1e.tar.gz
opensim-SC-a126097d6be209ba4e30b5573195c04bcf2d8c1e.tar.bz2
opensim-SC-a126097d6be209ba4e30b5573195c04bcf2d8c1e.tar.xz
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs
index 6dc0d92..061e232 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs
@@ -116,9 +116,9 @@ public sealed class BSTerrainMesh : BSTerrainPhys
        }
        // Set current terrain attributes
-        BulletSimAPI.SetFriction2(m_terrainBody.ptr, PhysicsScene.Params.terrainFriction);
+        BulletSimAPI.SetFriction2(m_terrainBody.ptr, BSParam.TerrainFriction);
-        BulletSimAPI.SetHitFraction2(m_terrainBody.ptr, PhysicsScene.Params.terrainHitFraction);
+        BulletSimAPI.SetHitFraction2(m_terrainBody.ptr, BSParam.TerrainHitFraction);
-        BulletSimAPI.SetRestitution2(m_terrainBody.ptr, PhysicsScene.Params.terrainRestitution);
+        BulletSimAPI.SetRestitution2(m_terrainBody.ptr, BSParam.TerrainRestitution);
        BulletSimAPI.SetCollisionFlags2(m_terrainBody.ptr, CollisionFlags.CF_STATIC_OBJECT);
        // Static objects are not very massive.
author	Melanie	2012-12-23 18:05:17 +0000
committer	Melanie	2012-12-23 18:05:17 +0000
commit	a126097d6be209ba4e30b5573195c04bcf2d8c1e (patch)
tree	bce8220f560827a332155ca84e16de94677ca235 /OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs
parent	Merge branch 'avination' into careminster (diff)
parent	BulletSim: modify avatar motor code to make falling movement better. Clean up... (diff)
download	opensim-SC-a126097d6be209ba4e30b5573195c04bcf2d8c1e.zip opensim-SC-a126097d6be209ba4e30b5573195c04bcf2d8c1e.tar.gz opensim-SC-a126097d6be209ba4e30b5573195c04bcf2d8c1e.tar.bz2 opensim-SC-a126097d6be209ba4e30b5573195c04bcf2d8c1e.tar.xz

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs index 6dc0d92..061e232 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs
@@ -116,9 +116,9 @@ public sealed class BSTerrainMesh : BSTerrainPhys
116	}	116	}
117		117
118	// Set current terrain attributes	118	// Set current terrain attributes
119	BulletSimAPI.SetFriction2(m_terrainBody.ptr, PhysicsScene.Params.terrainFriction);	119	BulletSimAPI.SetFriction2(m_terrainBody.ptr, BSParam.TerrainFriction);
120	BulletSimAPI.SetHitFraction2(m_terrainBody.ptr, PhysicsScene.Params.terrainHitFraction);	120	BulletSimAPI.SetHitFraction2(m_terrainBody.ptr, BSParam.TerrainHitFraction);
121	BulletSimAPI.SetRestitution2(m_terrainBody.ptr, PhysicsScene.Params.terrainRestitution);	121	BulletSimAPI.SetRestitution2(m_terrainBody.ptr, BSParam.TerrainRestitution);
122	BulletSimAPI.SetCollisionFlags2(m_terrainBody.ptr, CollisionFlags.CF_STATIC_OBJECT);	122	BulletSimAPI.SetCollisionFlags2(m_terrainBody.ptr, CollisionFlags.CF_STATIC_OBJECT);
123		123
124	// Static objects are not very massive.	124	// Static objects are not very massive.