diff options
| author | Melanie | 2011-10-25 01:42:52 +0100 |
|---|---|---|
| committer | Melanie | 2011-10-25 01:42:52 +0100 |
| commit | a8cc81a37e3e97fec4b4ce397c53e3b50fc84c4e (patch) | |
| tree | 197217a9944bf63f7bfeacf52ee7482bfde52ca9 /OpenSim/Region/Framework/Scenes/EntityBase.cs | |
| parent | Merge commit '631d5e16ef8c5340b6283b1a9ed9cc95aea3e3a1' into bigmerge (diff) | |
| parent | remove some mono compiler warnings (diff) | |
| download | opensim-SC-a8cc81a37e3e97fec4b4ce397c53e3b50fc84c4e.zip opensim-SC-a8cc81a37e3e97fec4b4ce397c53e3b50fc84c4e.tar.gz opensim-SC-a8cc81a37e3e97fec4b4ce397c53e3b50fc84c4e.tar.bz2 opensim-SC-a8cc81a37e3e97fec4b4ce397c53e3b50fc84c4e.tar.xz | |
Merge commit 'f08664f422f984fa57cc0ecb97c04eee3dccd183' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/EntityBase.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/EntityBase.cs b/OpenSim/Region/Framework/Scenes/EntityBase.cs index 680a4a3..664be01 100644 --- a/OpenSim/Region/Framework/Scenes/EntityBase.cs +++ b/OpenSim/Region/Framework/Scenes/EntityBase.cs | |||
| @@ -37,7 +37,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 37 | { | 37 | { |
| 38 | public abstract class EntityBase : ISceneEntity | 38 | public abstract class EntityBase : ISceneEntity |
| 39 | { | 39 | { |
| 40 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 40 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
| 41 | 41 | ||
| 42 | /// <summary> | 42 | /// <summary> |
| 43 | /// The scene to which this entity belongs | 43 | /// The scene to which this entity belongs |