diff options
| author | Justin Clark-Casey (justincc) | 2012-12-13 01:12:12 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-12-13 01:12:12 +0000 |
| commit | 8e8da20af2bf011098ebf68aae80d92da56dae65 (patch) | |
| tree | ff368505aa31f0df0fe83d9990ad3c08abb5e02e /OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | |
| parent | Fix sounds so that they play from inventory after teleport rather than only o... (diff) | |
| parent | BulletSim: fix problem of avatar's floating off the ground after unsitting. R... (diff) | |
| download | opensim-SC_OLD-8e8da20af2bf011098ebf68aae80d92da56dae65.zip opensim-SC_OLD-8e8da20af2bf011098ebf68aae80d92da56dae65.tar.gz opensim-SC_OLD-8e8da20af2bf011098ebf68aae80d92da56dae65.tar.bz2 opensim-SC_OLD-8e8da20af2bf011098ebf68aae80d92da56dae65.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | 1 |
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 | } |