From 4ae30873ad1c0d48b7e03047eafe5cd690bbe61c Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Thu, 22 Nov 2012 12:01:56 -0800
Subject: BulletSim: Add tables and initialization for different attributes for
 different materials. For the moment, the per material tables are not used.

---
 OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'OpenSim/Region/Physics/BulletSPlugin/BSScene.cs')

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
                 // Do any replacements in the parameters
                 m_physicsLoggingPrefix = m_physicsLoggingPrefix.Replace("%REGIONNAME%", RegionName);
             }
+
+            // The material characteristics.
+            BSMaterials.InitializeFromDefaults(Params);
+            if (pConfig != null)
+            {
+                BSMaterials.InitializefromParameters(pConfig);
+            }
         }
     }
 
-- 
cgit v1.1