diff options
author | Melanie | 2011-10-25 02:55:38 +0100 |
---|---|---|
committer | Melanie | 2011-10-25 02:55:38 +0100 |
commit | 6a01246cc62ccf48eca0a4e4263d98f2ddd040cb (patch) | |
tree | 76a1a374ca6d3af44e0b35a53c86d3ff0e5d7225 /OpenSim/Region/Physics/OdePlugin | |
parent | Merge commit '1d4cd76e8a8c64da71fc384ff9c654d7f4f849c1' into bigmerge (diff) | |
parent | Store scene identifier passed in to OdeScene for later debug messages (diff) | |
download | opensim-SC-6a01246cc62ccf48eca0a4e4263d98f2ddd040cb.zip opensim-SC-6a01246cc62ccf48eca0a4e4263d98f2ddd040cb.tar.gz opensim-SC-6a01246cc62ccf48eca0a4e4263d98f2ddd040cb.tar.bz2 opensim-SC-6a01246cc62ccf48eca0a4e4263d98f2ddd040cb.tar.xz |
Merge commit '03202ada2918c0c0837e8de50e3a0436e4407c91' into bigmerge
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdeScene.cs | 7 |
1 files changed, 5 insertions, 2 deletions
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; |