diff options
| author | Melanie | 2012-03-20 23:39:02 +0000 |
|---|---|---|
| committer | Melanie | 2012-03-20 23:39:02 +0000 |
| commit | 35c3124c3badfc7c6e3b0ee1957cb827be678650 (patch) | |
| tree | e245c0080da5acc0b9192208d0a421be865ba2cb /OpenSim/Tests/Common | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Add prim name to "[MESH]: No recognized physics mesh..." log message (diff) | |
| download | opensim-SC_OLD-35c3124c3badfc7c6e3b0ee1957cb827be678650.zip opensim-SC_OLD-35c3124c3badfc7c6e3b0ee1957cb827be678650.tar.gz opensim-SC_OLD-35c3124c3badfc7c6e3b0ee1957cb827be678650.tar.bz2 opensim-SC_OLD-35c3124c3badfc7c6e3b0ee1957cb827be678650.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Tests/Common')
| -rw-r--r-- | OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs b/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs index 295e868..579d41c 100644 --- a/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs +++ b/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs | |||
| @@ -120,7 +120,7 @@ namespace OpenSim.Data.Null | |||
| 120 | /// </summary> | 120 | /// </summary> |
| 121 | public class NullDataStore : ISimulationDataStore | 121 | public class NullDataStore : ISimulationDataStore |
| 122 | { | 122 | { |
| 123 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 123 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
| 124 | 124 | ||
| 125 | protected Dictionary<UUID, RegionSettings> m_regionSettings = new Dictionary<UUID, RegionSettings>(); | 125 | protected Dictionary<UUID, RegionSettings> m_regionSettings = new Dictionary<UUID, RegionSettings>(); |
| 126 | protected Dictionary<UUID, SceneObjectPart> m_sceneObjectParts = new Dictionary<UUID, SceneObjectPart>(); | 126 | protected Dictionary<UUID, SceneObjectPart> m_sceneObjectParts = new Dictionary<UUID, SceneObjectPart>(); |