diff options
author | BlueWall | 2011-11-26 17:20:20 -0500 |
---|---|---|
committer | BlueWall | 2011-11-26 17:20:20 -0500 |
commit | 19c10c892adc7168107e8866cf4d7d20b876e2a8 (patch) | |
tree | 6c6ed57160a010a17c95dbda6901f97dd845b9e4 /OpenSim/Region/Physics/Manager | |
parent | Add missing property to llGetLinkPrimitiveParams (diff) | |
parent | When removing an LSL sensor for a script (e.g. through llResetScript() or sta... (diff) | |
download | opensim-SC-19c10c892adc7168107e8866cf4d7d20b876e2a8.zip opensim-SC-19c10c892adc7168107e8866cf4d7d20b876e2a8.tar.gz opensim-SC-19c10c892adc7168107e8866cf4d7d20b876e2a8.tar.bz2 opensim-SC-19c10c892adc7168107e8866cf4d7d20b876e2a8.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics/Manager')
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsScene.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs index 7ab295a..2a6163c 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs | |||
@@ -56,7 +56,7 @@ namespace OpenSim.Region.Physics.Manager | |||
56 | 56 | ||
57 | public abstract class PhysicsScene | 57 | public abstract class PhysicsScene |
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> | 61 | /// <summary> |
62 | /// Name of this scene. Useful in debug messages to distinguish one OdeScene instance from another. | 62 | /// Name of this scene. Useful in debug messages to distinguish one OdeScene instance from another. |