1 files changed, 18 insertions, 45 deletions

diff --git a/OpenSim/Region/UserStatistics/WebStatsModule.cs b/OpenSim/Region/UserStatistics/WebStatsModule.cs
index 3139b8a..9d87c45 100644
--- a/OpenSim/Region/UserStatistics/WebStatsModule.cs
+++ b/OpenSim/Region/UserStatistics/WebStatsModule.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Region.UserStatistics
         
         private static SqliteConnection dbConn;
         private Dictionary<UUID, UserSessionID> m_sessions = new Dictionary<UUID, UserSessionID>();
-        private List<Scene> m_scene = new List<Scene>();
+        private List<Scene> m_scenes = new List<Scene>();
         private Dictionary<string, IStatsController> reports = new Dictionary<string, IStatsController>();
         private Dictionary<UUID, USimStatsData> m_simstatsCounters = new Dictionary<UUID, USimStatsData>(); 
         private const int updateStatsMod = 6;
@@ -71,25 +71,17 @@ namespace OpenSim.Region.UserStatistics
 
         public virtual void Initialise(Scene scene, IConfigSource config)
         {
-            IConfig cnfg;
-            try
-            {
-                cnfg = config.Configs["WebStats"];
+            IConfig cnfg = config.Configs["WebStats"];
+
+            if (cnfg != null)
                 enabled = cnfg.GetBoolean("enabled", false);
-            } 
-            catch (Exception)
-            {
-                enabled = false;
-            }
             
             if (!enabled)
-            {
                 return;
-            }
 
-            lock (m_scene)
+            lock (m_scenes)
             {
-                if (m_scene.Count == 0)
+                if (m_scenes.Count == 0)
                 {
                     //IConfig startupConfig = config.Configs["Startup"];
 
@@ -115,22 +107,19 @@ namespace OpenSim.Region.UserStatistics
                     reports.Add("clients.report", clientReport);
                     reports.Add("sessions.report", sessionsReport);
 
-
-
                     ////
                     // Add Your own Reports here (Do Not Modify Lines here Devs!)
                     ////
 
                     ////
                     // End Own reports section
-                    //// 
-
+                    ////
 
                     MainServer.Instance.AddHTTPHandler("/SStats/", HandleStatsRequest);
                     MainServer.Instance.AddHTTPHandler("/CAPS/VS/", HandleUnknownCAPSRequest);
                 }
                 
-                m_scene.Add(scene);
+                m_scenes.Add(scene);
                 if (m_simstatsCounters.ContainsKey(scene.RegionInfo.RegionID))
                     m_simstatsCounters.Remove(scene.RegionInfo.RegionID);
 
@@ -214,7 +203,7 @@ namespace OpenSim.Region.UserStatistics
 
 
                 repParams["DatabaseConnection"] = dbConn;
-                repParams["Scenes"] = m_scene;
+                repParams["Scenes"] = m_scenes;
                 repParams["SimStats"] = m_simstatsCounters;
                 repParams["LogLines"] = m_loglines;
                 repParams["Reports"] = reports;
@@ -265,7 +254,6 @@ namespace OpenSim.Region.UserStatistics
                     CreateTables(db);
                 }
             }
-
         }
 
         public void CreateTables(SqliteConnection db)
@@ -277,8 +265,6 @@ namespace OpenSim.Region.UserStatistics
             createcmd.ExecuteNonQuery();
         }
 
-
-
         public virtual void PostInitialise()
         {
             if (!enabled)
@@ -297,7 +283,7 @@ namespace OpenSim.Region.UserStatistics
             dbConn.Close();
             dbConn.Dispose();
             m_sessions.Clear();
-            m_scene.Clear();
+            m_scenes.Clear();
             reports.Clear();
             m_simstatsCounters.Clear(); 
         }
@@ -333,10 +319,10 @@ namespace OpenSim.Region.UserStatistics
 
         protected virtual void AddHandlers()
         {
-            lock (m_scene)
+            lock (m_scenes)
             {
-                updateLogMod = m_scene.Count * 2;
-                foreach (Scene scene in m_scene)
+                updateLogMod = m_scenes.Count * 2;
+                foreach (Scene scene in m_scenes)
                 {
                     scene.EventManager.OnRegisterCaps += OnRegisterCaps;
                     scene.EventManager.OnDeregisterCaps += OnDeRegisterCaps;
@@ -376,15 +362,11 @@ namespace OpenSim.Region.UserStatistics
             }
         }
 
-
-
-
         public void OnMakeChildAgent(ScenePresence agent)
         {
             
         }
 
-
         public void OnClientClosed(UUID agentID, Scene scene)
         {
             lock (m_sessions)
@@ -394,7 +376,6 @@ namespace OpenSim.Region.UserStatistics
                     m_sessions.Remove(agentID);
                 }
             }
-
         }
 
         public string readLogLines(int amount)
@@ -433,14 +414,13 @@ namespace OpenSim.Region.UserStatistics
             fs.Close();
             fs.Dispose();
             return encoding.GetString(buffer);
-
         }
 
         public UUID GetRegionUUIDFromHandle(ulong regionhandle)
         {
-            lock (m_scene)
+            lock (m_scenes)
             {
-                foreach (Scene scene in m_scene)
+                foreach (Scene scene in m_scenes)
                 {
                     if (scene.RegionInfo.RegionHandle == regionhandle)
                         return scene.RegionInfo.RegionID;
@@ -448,6 +428,7 @@ namespace OpenSim.Region.UserStatistics
             }
             return UUID.Zero;
         }
+
         /// <summary>
         /// Callback for a viewerstats cap
         /// </summary>
@@ -523,8 +504,6 @@ namespace OpenSim.Region.UserStatistics
            
             usd = uid.session_data;
 
-            
-
             if (message.Type != OSDType.Map)
                 return new UserSessionID();
 
@@ -699,7 +678,6 @@ namespace OpenSim.Region.UserStatistics
 
                 }
             }
-
         }
 
         #region SQL
@@ -824,6 +802,7 @@ set session_id=:session_id,
 WHERE session_id=:session_key AND agent_id=:agent_key AND region_id=:region_key";
         #endregion
     }
+
     public static class UserSessionUtil
     {
         public static UserSessionData newUserSessionData()
@@ -941,7 +920,6 @@ WHERE session_id=:session_key AND agent_id=:agent_key AND region_id=:region_key"
             return result / cnt;
         }
 
-
         public static float ArrayMode_f(float[] arr)
         {
             List<float> mode = new List<float>();
@@ -995,10 +973,8 @@ WHERE session_id=:session_key AND agent_id=:agent_key AND region_id=:region_key"
             }
 
             return mode.ToArray()[0];
-
         }
 
-
         public static int ArrayMode_i(int[] arr)
         {
             List<int> mode = new List<int>();
@@ -1052,7 +1028,6 @@ WHERE session_id=:session_key AND agent_id=:agent_key AND region_id=:region_key"
             }
 
             return mode.ToArray()[0];
-
         }
 
         #endregion
@@ -1178,7 +1153,6 @@ WHERE session_id=:session_key AND agent_id=:agent_key AND region_id=:region_key"
         public List<float> _sim_fps;
         public List<int> _agents_in_view;
     }
-
   
     #endregion
 
@@ -1263,5 +1237,4 @@ WHERE session_id=:session_key AND agent_id=:agent_key AND region_id=:region_key"
             m_scriptLinesPerSecond = stats.StatsBlock[20].StatValue;
         }
     }
-
-}
+}
\ No newline at end of file