From 03202ada2918c0c0837e8de50e3a0436e4407c91 Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Tue, 18 Oct 2011 21:11:13 +0100 Subject: [PATCH] Store scene identifier passed in to OdeScene for later debug messages --- OpenSim/Region/Physics/Manager/PhysicsScene.cs | 5 +++++ OpenSim/Region/Physics/OdePlugin/OdeScene.cs | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs index 07f2612d2d..eaa1175fce 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs @@ -58,6 +58,11 @@ namespace OpenSim.Region.Physics.Manager { private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + /// + /// Name of this scene. Useful in debug messages to distinguish one OdeScene instance from another. + /// + public string Name { get; protected set; } + // The only thing that should register for this event is the SceneGraph // Anything else could cause problems. diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs index 67ed66e923..8cce349608 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs @@ -310,10 +310,13 @@ namespace OpenSim.Region.Physics.OdePlugin /// Sets many properties that ODE requires to be stable /// These settings need to be tweaked 'exactly' right or weird stuff happens. /// - public OdeScene(string sceneIdentifier) + /// Name of the scene. Useful in debug messages. + public OdeScene(string name) { m_log - = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType.ToString() + "." + sceneIdentifier); + = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType.ToString() + "." + name); + + Name = name; nearCallback = near; triCallback = TriCallback;