diff options
author | Diva Canto | 2012-03-20 17:19:14 -0700 |
---|---|---|
committer | Diva Canto | 2012-03-20 17:19:14 -0700 |
commit | 3fa51f66ec2f032134f333bf1fa047275a77f6e0 (patch) | |
tree | 952df67fcc209ecc81ce66b92f4bdf93a7017e08 /OpenSim/Tests/Common | |
parent | HG Friends: allow the establishment of HG friendships without requiring co-pr... (diff) | |
parent | Add ability to log warn if a frame takes longer than twice the expected time.... (diff) | |
download | opensim-SC_OLD-3fa51f66ec2f032134f333bf1fa047275a77f6e0.zip opensim-SC_OLD-3fa51f66ec2f032134f333bf1fa047275a77f6e0.tar.gz opensim-SC_OLD-3fa51f66ec2f032134f333bf1fa047275a77f6e0.tar.bz2 opensim-SC_OLD-3fa51f66ec2f032134f333bf1fa047275a77f6e0.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Conflicts:
OpenSim/Framework/Util.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>(); |