From 3b0db66b92a9e497d965d2a26c9d6de643612b63 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Mon, 15 Dec 2008 18:39:54 +0000 Subject: * 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 --- OpenSim/Region/Application/OpenSimBase.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'OpenSim/Region/Application') 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); } /// /// 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 /// + /// 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, -- cgit v1.1