aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-10-18 21:11:13 +0100
committerJustin Clark-Casey (justincc)2011-10-18 21:11:13 +0100
commit03202ada2918c0c0837e8de50e3a0436e4407c91 (patch)
tree13ed926bd4771679d957b83f4a19ba98d6bdf4e6 /OpenSim/Region
parentDon't bother taking OdeLock during OdeScene construction, since there can be ... (diff)
downloadopensim-SC_OLD-03202ada2918c0c0837e8de50e3a0436e4407c91.zip
opensim-SC_OLD-03202ada2918c0c0837e8de50e3a0436e4407c91.tar.gz
opensim-SC_OLD-03202ada2918c0c0837e8de50e3a0436e4407c91.tar.bz2
opensim-SC_OLD-03202ada2918c0c0837e8de50e3a0436e4407c91.tar.xz
Store scene identifier passed in to OdeScene for later debug messages
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsScene.cs5
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdeScene.cs7
2 files changed, 10 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index 07f2612..eaa1175 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -58,6 +58,11 @@ namespace OpenSim.Region.Physics.Manager
58 { 58 {
59 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 59 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
60 60
61 /// <summary>
62 /// Name of this scene. Useful in debug messages to distinguish one OdeScene instance from another.
63 /// </summary>
64 public string Name { get; protected set; }
65
61 // The only thing that should register for this event is the SceneGraph 66 // The only thing that should register for this event is the SceneGraph
62 // Anything else could cause problems. 67 // Anything else could cause problems.
63 68
diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
index 67ed66e..8cce349 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
@@ -310,10 +310,13 @@ namespace OpenSim.Region.Physics.OdePlugin
310 /// Sets many properties that ODE requires to be stable 310 /// Sets many properties that ODE requires to be stable
311 /// These settings need to be tweaked 'exactly' right or weird stuff happens. 311 /// These settings need to be tweaked 'exactly' right or weird stuff happens.
312 /// </summary> 312 /// </summary>
313 public OdeScene(string sceneIdentifier) 313 /// <param value="name">Name of the scene. Useful in debug messages.</param>
314 public OdeScene(string name)
314 { 315 {
315 m_log 316 m_log
316 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType.ToString() + "." + sceneIdentifier); 317 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType.ToString() + "." + name);
318
319 Name = name;
317 320
318 nearCallback = near; 321 nearCallback = near;
319 triCallback = TriCallback; 322 triCallback = TriCallback;