OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '03202ada2918c0c0837e8de50e3a0436e4407c91' into bigmerge

avinationmerge
Melanie 2011-10-25 02:55:38 +01:00
parent 10dff1da7f 03202ada29
commit 6a01246cc6
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Region/Physics/Manager/PhysicsScene.cs
View File

@ -58,6 +58,11 @@ namespace OpenSim.Region.Physics.Manager
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
/// <summary>
/// Name of this scene. Useful in debug messages to distinguish one OdeScene instance from another.
/// </summary>
public string Name { get; protected set; }
// The only thing that should register for this event is the SceneGraph // The only thing that should register for this event is the SceneGraph
// Anything else could cause problems. // Anything else could cause problems.

7
OpenSim/Region/Physics/OdePlugin/OdeScene.cs
View File

@ -310,10 +310,13 @@ namespace OpenSim.Region.Physics.OdePlugin
/// Sets many properties that ODE requires to be stable /// Sets many properties that ODE requires to be stable
/// These settings need to be tweaked 'exactly' right or weird stuff happens. /// These settings need to be tweaked 'exactly' right or weird stuff happens.
/// </summary> /// </summary>
public OdeScene(string sceneIdentifier) /// <param value="name">Name of the scene. Useful in debug messages.</param>
public OdeScene(string name)
{ {
m_log m_log
= LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType.ToString() + "." + sceneIdentifier); = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType.ToString() + "." + name);
Name = name;
nearCallback = near; nearCallback = near;
triCallback = TriCallback; triCallback = TriCallback;