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

diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 3dba20f..832043d 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -518,16 +518,16 @@ namespace OpenSim
 
         # region Setup methods
 
-        protected override PhysicsScene GetPhysicsScene()
+        protected override PhysicsScene GetPhysicsScene(string osSceneIdentifier)
         {
-            return GetPhysicsScene(m_configSettings.PhysicsEngine, m_configSettings.MeshEngineName, m_config.Source);
+            return GetPhysicsScene(
+                m_configSettings.PhysicsEngine, m_configSettings.MeshEngineName, m_config.Source, osSceneIdentifier);
         }
 
         /// <summary>
         /// Handler to supply the current status of this sim
-        ///
-        /// Currently this is always OK if the simulator is still listening for connections on its HTTP service
         /// </summary>
+        /// Currently this is always OK if the simulator is still listening for connections on its HTTP service
         protected class SimStatusHandler : IStreamedRequestHandler
         {
             public byte[] Handle(string path, Stream request,