aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
diff options
context:
space:
mode:
authorBlueWall2012-12-12 23:34:20 -0500
committerBlueWall2012-12-12 23:34:20 -0500
commit7a87c35f94a846e9a2b74d2347c2be5ba0511a38 (patch)
treeecb370ecb60a256a0b40787d76932a0d86b78ec4 /OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
parentMove setting to correct locations in ini (diff)
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-7a87c35f94a846e9a2b74d2347c2be5ba0511a38.zip
opensim-SC_OLD-7a87c35f94a846e9a2b74d2347c2be5ba0511a38.tar.gz
opensim-SC_OLD-7a87c35f94a846e9a2b74d2347c2be5ba0511a38.tar.bz2
opensim-SC_OLD-7a87c35f94a846e9a2b74d2347c2be5ba0511a38.tar.xz
Merge branch 'master' of /home/opensim/var/repo/opensim
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSScene.cs')
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BSScene.cs1
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
index f4f2801..cf5bb57 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
@@ -309,6 +309,7 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
309 BSMaterials.InitializeFromDefaults(Params); 309 BSMaterials.InitializeFromDefaults(Params);
310 if (pConfig != null) 310 if (pConfig != null)
311 { 311 {
312 // Let the user add new and interesting material property values.
312 BSMaterials.InitializefromParameters(pConfig); 313 BSMaterials.InitializefromParameters(pConfig);
313 } 314 }
314 } 315 }