aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-10-05 23:36:27 +0100
committerJustin Clark-Casey (justincc)2011-10-05 23:36:27 +0100
commit7fa1c979cf60a981200c4ddc3ea0ff8d0ddb2aa7 (patch)
treed0f5a4010f58032e1e5b5d93ef6fb360bd3e4c50 /OpenSim/Region
parentAdd user ID to new estate user prompt, to make it clearer and consistent with... (diff)
downloadopensim-SC_OLD-7fa1c979cf60a981200c4ddc3ea0ff8d0ddb2aa7.zip
opensim-SC_OLD-7fa1c979cf60a981200c4ddc3ea0ff8d0ddb2aa7.tar.gz
opensim-SC_OLD-7fa1c979cf60a981200c4ddc3ea0ff8d0ddb2aa7.tar.bz2
opensim-SC_OLD-7fa1c979cf60a981200c4ddc3ea0ff8d0ddb2aa7.tar.xz
rename WebStatsModules.m_scene to m_scenes since it's a list of scenes, not a single one
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/UserStatistics/WebStatsModule.cs22
1 files changed, 11 insertions, 11 deletions
diff --git a/OpenSim/Region/UserStatistics/WebStatsModule.cs b/OpenSim/Region/UserStatistics/WebStatsModule.cs
index fc95189..9d87c45 100644
--- a/OpenSim/Region/UserStatistics/WebStatsModule.cs
+++ b/OpenSim/Region/UserStatistics/WebStatsModule.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Region.UserStatistics
58 58
59 private static SqliteConnection dbConn; 59 private static SqliteConnection dbConn;
60 private Dictionary<UUID, UserSessionID> m_sessions = new Dictionary<UUID, UserSessionID>(); 60 private Dictionary<UUID, UserSessionID> m_sessions = new Dictionary<UUID, UserSessionID>();
61 private List<Scene> m_scene = new List<Scene>(); 61 private List<Scene> m_scenes = new List<Scene>();
62 private Dictionary<string, IStatsController> reports = new Dictionary<string, IStatsController>(); 62 private Dictionary<string, IStatsController> reports = new Dictionary<string, IStatsController>();
63 private Dictionary<UUID, USimStatsData> m_simstatsCounters = new Dictionary<UUID, USimStatsData>(); 63 private Dictionary<UUID, USimStatsData> m_simstatsCounters = new Dictionary<UUID, USimStatsData>();
64 private const int updateStatsMod = 6; 64 private const int updateStatsMod = 6;
@@ -79,9 +79,9 @@ namespace OpenSim.Region.UserStatistics
79 if (!enabled) 79 if (!enabled)
80 return; 80 return;
81 81
82 lock (m_scene) 82 lock (m_scenes)
83 { 83 {
84 if (m_scene.Count == 0) 84 if (m_scenes.Count == 0)
85 { 85 {
86 //IConfig startupConfig = config.Configs["Startup"]; 86 //IConfig startupConfig = config.Configs["Startup"];
87 87
@@ -119,7 +119,7 @@ namespace OpenSim.Region.UserStatistics
119 MainServer.Instance.AddHTTPHandler("/CAPS/VS/", HandleUnknownCAPSRequest); 119 MainServer.Instance.AddHTTPHandler("/CAPS/VS/", HandleUnknownCAPSRequest);
120 } 120 }
121 121
122 m_scene.Add(scene); 122 m_scenes.Add(scene);
123 if (m_simstatsCounters.ContainsKey(scene.RegionInfo.RegionID)) 123 if (m_simstatsCounters.ContainsKey(scene.RegionInfo.RegionID))
124 m_simstatsCounters.Remove(scene.RegionInfo.RegionID); 124 m_simstatsCounters.Remove(scene.RegionInfo.RegionID);
125 125
@@ -203,7 +203,7 @@ namespace OpenSim.Region.UserStatistics
203 203
204 204
205 repParams["DatabaseConnection"] = dbConn; 205 repParams["DatabaseConnection"] = dbConn;
206 repParams["Scenes"] = m_scene; 206 repParams["Scenes"] = m_scenes;
207 repParams["SimStats"] = m_simstatsCounters; 207 repParams["SimStats"] = m_simstatsCounters;
208 repParams["LogLines"] = m_loglines; 208 repParams["LogLines"] = m_loglines;
209 repParams["Reports"] = reports; 209 repParams["Reports"] = reports;
@@ -283,7 +283,7 @@ namespace OpenSim.Region.UserStatistics
283 dbConn.Close(); 283 dbConn.Close();
284 dbConn.Dispose(); 284 dbConn.Dispose();
285 m_sessions.Clear(); 285 m_sessions.Clear();
286 m_scene.Clear(); 286 m_scenes.Clear();
287 reports.Clear(); 287 reports.Clear();
288 m_simstatsCounters.Clear(); 288 m_simstatsCounters.Clear();
289 } 289 }
@@ -319,10 +319,10 @@ namespace OpenSim.Region.UserStatistics
319 319
320 protected virtual void AddHandlers() 320 protected virtual void AddHandlers()
321 { 321 {
322 lock (m_scene) 322 lock (m_scenes)
323 { 323 {
324 updateLogMod = m_scene.Count * 2; 324 updateLogMod = m_scenes.Count * 2;
325 foreach (Scene scene in m_scene) 325 foreach (Scene scene in m_scenes)
326 { 326 {
327 scene.EventManager.OnRegisterCaps += OnRegisterCaps; 327 scene.EventManager.OnRegisterCaps += OnRegisterCaps;
328 scene.EventManager.OnDeregisterCaps += OnDeRegisterCaps; 328 scene.EventManager.OnDeregisterCaps += OnDeRegisterCaps;
@@ -418,9 +418,9 @@ namespace OpenSim.Region.UserStatistics
418 418
419 public UUID GetRegionUUIDFromHandle(ulong regionhandle) 419 public UUID GetRegionUUIDFromHandle(ulong regionhandle)
420 { 420 {
421 lock (m_scene) 421 lock (m_scenes)
422 { 422 {
423 foreach (Scene scene in m_scene) 423 foreach (Scene scene in m_scenes)
424 { 424 {
425 if (scene.RegionInfo.RegionHandle == regionhandle) 425 if (scene.RegionInfo.RegionHandle == regionhandle)
426 return scene.RegionInfo.RegionID; 426 return scene.RegionInfo.RegionID;