* 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

2 files changed, 6 insertions, 3 deletions

diff --git a/OpenSim/Region/Physics/POSPlugin/POSPlugin.cs b/OpenSim/Region/Physics/POSPlugin/POSPlugin.cs
index c8cbcf5..04e3e75 100644
--- a/OpenSim/Region/Physics/POSPlugin/POSPlugin.cs
+++ b/OpenSim/Region/Physics/POSPlugin/POSPlugin.cs
@@ -47,9 +47,9 @@ namespace OpenSim.Region.Physics.POSPlugin
             return true;
         }
 
-        public PhysicsScene GetScene()
+        public PhysicsScene GetScene(string sceneIdentifier)
         {
-            return new POSScene();
+            return new POSScene(sceneIdentifier);
         }
 
         public string GetName()
diff --git a/OpenSim/Region/Physics/POSPlugin/POSScene.cs b/OpenSim/Region/Physics/POSPlugin/POSScene.cs
index 9a4e92f..43af72d 100644
--- a/OpenSim/Region/Physics/POSPlugin/POSScene.cs
+++ b/OpenSim/Region/Physics/POSPlugin/POSScene.cs
@@ -41,8 +41,11 @@ namespace OpenSim.Region.Physics.POSPlugin
         private float[] _heightMap;
         private const float gravity = -9.8f;
 
-        public POSScene()
+        string sceneIdentifier;
+
+        public POSScene(String _sceneIdentifier)
         {
+            sceneIdentifier = _sceneIdentifier;
         }
 
         public override void Initialise(IMesher meshmerizer, IConfigSource config)