diff options
| author | Robert Adams | 2012-11-22 12:01:56 -0800 |
|---|---|---|
| committer | Robert Adams | 2012-11-25 20:04:26 -0800 |
| commit | 4ae30873ad1c0d48b7e03047eafe5cd690bbe61c (patch) | |
| tree | 0b72ed847334ef1567273375386cbb944f6e9faf /OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | |
| parent | Combine TestDeleteSceneObjectAsync() with TestDeRezSceneObject() as they are ... (diff) | |
| download | opensim-SC_OLD-4ae30873ad1c0d48b7e03047eafe5cd690bbe61c.zip opensim-SC_OLD-4ae30873ad1c0d48b7e03047eafe5cd690bbe61c.tar.gz opensim-SC_OLD-4ae30873ad1c0d48b7e03047eafe5cd690bbe61c.tar.bz2 opensim-SC_OLD-4ae30873ad1c0d48b7e03047eafe5cd690bbe61c.tar.xz | |
BulletSim: Add tables and initialization for different attributes for different materials. For the moment, the per material tables are not used.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSScene.cs')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs index 27a78d1..37bdb84 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | |||
| @@ -308,6 +308,13 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters | |||
| 308 | // Do any replacements in the parameters | 308 | // Do any replacements in the parameters |
| 309 | m_physicsLoggingPrefix = m_physicsLoggingPrefix.Replace("%REGIONNAME%", RegionName); | 309 | m_physicsLoggingPrefix = m_physicsLoggingPrefix.Replace("%REGIONNAME%", RegionName); |
| 310 | } | 310 | } |
| 311 | |||
| 312 | // The material characteristics. | ||
| 313 | BSMaterials.InitializeFromDefaults(Params); | ||
| 314 | if (pConfig != null) | ||
| 315 | { | ||
| 316 | BSMaterials.InitializefromParameters(pConfig); | ||
| 317 | } | ||
| 311 | } | 318 | } |
| 312 | } | 319 | } |
| 313 | 320 | ||