aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSimBase.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-12-15 18:39:54 +0000
committerJustin Clarke Casey2008-12-15 18:39:54 +0000
commit3b0db66b92a9e497d965d2a26c9d6de643612b63 (patch)
tree3452afd22484b8baad138a3ecc5469ea57c8427f /OpenSim/Region/Application/OpenSimBase.cs
parent* minor: Stop presence child status suffering an NRE if the agent uuid given ... (diff)
downloadopensim-SC_OLD-3b0db66b92a9e497d965d2a26c9d6de643612b63.zip
opensim-SC_OLD-3b0db66b92a9e497d965d2a26c9d6de643612b63.tar.gz
opensim-SC_OLD-3b0db66b92a9e497d965d2a26c9d6de643612b63.tar.bz2
opensim-SC_OLD-3b0db66b92a9e497d965d2a26c9d6de643612b63.tar.xz
* 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
Diffstat (limited to 'OpenSim/Region/Application/OpenSimBase.cs')
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs8
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
518 518
519 # region Setup methods 519 # region Setup methods
520 520
521 protected override PhysicsScene GetPhysicsScene() 521 protected override PhysicsScene GetPhysicsScene(string osSceneIdentifier)
522 { 522 {
523 return GetPhysicsScene(m_configSettings.PhysicsEngine, m_configSettings.MeshEngineName, m_config.Source); 523 return GetPhysicsScene(
524 m_configSettings.PhysicsEngine, m_configSettings.MeshEngineName, m_config.Source, osSceneIdentifier);
524 } 525 }
525 526
526 /// <summary> 527 /// <summary>
527 /// Handler to supply the current status of this sim 528 /// Handler to supply the current status of this sim
528 ///
529 /// Currently this is always OK if the simulator is still listening for connections on its HTTP service
530 /// </summary> 529 /// </summary>
530 /// Currently this is always OK if the simulator is still listening for connections on its HTTP service
531 protected class SimStatusHandler : IStreamedRequestHandler 531 protected class SimStatusHandler : IStreamedRequestHandler
532 { 532 {
533 public byte[] Handle(string path, Stream request, 533 public byte[] Handle(string path, Stream request,