* Apply http://opensimulator.org/mantis/view.php?id=2775 with small tweaks

* This pushes an identifier for the OpenSim scene to the physics scene.  This allows log messages from the physics scene to identify which OpenSim scene they relate to.
* Thanks Gerhard

1 files changed, 8 insertions, 2 deletions

diff --git a/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs b/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
index 4f1afdd..8f5ffd8 100644
--- a/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
+++ b/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
@@ -212,11 +212,11 @@ namespace OpenSim.Region.Physics.BulletXPlugin
             return true;
         }
 
-        public PhysicsScene GetScene()
+        public PhysicsScene GetScene(string sceneIdentifier)
         {
             if (_mScene == null)
             {
-                _mScene = new BulletXScene();
+                _mScene = new BulletXScene(sceneIdentifier);
             }
             return (_mScene);
         }
@@ -493,6 +493,12 @@ namespace OpenSim.Region.Physics.BulletXPlugin
         public IMesher mesher;
         // private IConfigSource m_config;
 
+        String identifier;
+
+        public BulletXScene(String sceneIdentifier)
+        {
+            identifier = sceneIdentifier;
+        }
 
         public static float Gravity
         {