* 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, 6 insertions, 3 deletions

diff --git a/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs b/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs
index 6502827..a7ee26d 100644
--- a/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs
+++ b/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs
@@ -51,11 +51,11 @@ namespace OpenSim.Region.Physics.PhysXPlugin
             return true;
         }
 
-        public PhysicsScene GetScene()
+        public PhysicsScene GetScene(string sceneIdentifier)
         {
             if (_mScene == null)
             {
-                _mScene = new PhysXScene();
+                _mScene = new PhysXScene(sceneIdentifier);
             }
             return (_mScene);
         }
@@ -78,8 +78,11 @@ namespace OpenSim.Region.Physics.PhysXPlugin
         private NxPhysicsSDK mySdk;
         private NxScene scene;
 
-        public PhysXScene()
+        string sceneIdentifier;
+        public PhysXScene(string _sceneIdentifier)
         {
+            sceneIdentifier = _sceneIdentifier;
+
             mySdk = NxPhysicsSDK.CreateSDK();
             Console.WriteLine("Sdk created - now creating scene");
             scene = mySdk.CreateScene();