From a1c9349d4765833691e7816d7f4df7bd37b9ee36 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Mon, 4 Feb 2008 16:22:58 +0000
Subject: Refactor only: serve stats objects directly through StatsManager
 singleton

---
 OpenSim/Region/Application/OpenSimMain.cs                | 6 +++---
 OpenSim/Region/Communications/Local/LocalLoginService.cs | 4 ++--
 OpenSim/Region/Communications/Local/LocalUserServices.cs | 5 ++---
 OpenSim/Region/Examples/SimpleApp/Program.cs             | 4 ++--
 4 files changed, 9 insertions(+), 10 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 1754f7e..da4cf3e 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -304,7 +304,7 @@ namespace OpenSim
             m_log = CreateLog();
             MainLog.Instance = m_log;          
 
-            StatsManager.StartCollecting();
+            StatsManager.StartCollectingSimExtraStats();
             
             // Do baseclass startup sequence: OpenSim.Region.ClientStack.RegionApplicationBase.StartUp
             // TerrainManager, StorageManager, HTTP Server
@@ -320,7 +320,7 @@ namespace OpenSim
 
                 LocalUserServices userService =
                     new LocalUserServices(m_networkServersInfo, m_networkServersInfo.DefaultHomeLocX,
-                                          m_networkServersInfo.DefaultHomeLocY, inventoryService, null);
+                                          m_networkServersInfo.DefaultHomeLocY, inventoryService);
                 userService.AddPlugin(m_standaloneUserPlugin);
 
                 LocalBackEndServices backendService = new LocalBackEndServices();
@@ -333,7 +333,7 @@ namespace OpenSim
                 // TODO No user stats collection yet for standalone
                 m_loginService =
                     new LocalLoginService(userService, m_standaloneWelcomeMessage, localComms, m_networkServersInfo,
-                                          null, m_standaloneAuthenticate);
+                                          m_standaloneAuthenticate);
                 m_loginService.OnLoginToRegion += backendService.AddNewSession;
 
                 // XMLRPC action
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs
index 7dee2cb..2848b8a 100644
--- a/OpenSim/Region/Communications/Local/LocalLoginService.cs
+++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs
@@ -55,8 +55,8 @@ namespace OpenSim.Region.Communications.Local
 
         public LocalLoginService(UserManagerBase userManager, string welcomeMess, 
                                  CommunicationsLocal parent, NetworkServersInfo serversInfo, 
-                                 UserStatsReporter statsCollector, bool authenticate)
-            : base(userManager, parent.UserProfileCacheService.libraryRoot, statsCollector, welcomeMess)
+                                 bool authenticate)
+            : base(userManager, parent.UserProfileCacheService.libraryRoot, welcomeMess)
         {
             m_Parent = parent;
             this.serversInfo = serversInfo;
diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs
index 8a4d4e7..6192a7a 100644
--- a/OpenSim/Region/Communications/Local/LocalUserServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs
@@ -52,8 +52,7 @@ namespace OpenSim.Region.Communications.Local
         /// <param name="inventoryService"></param>
         /// <param name="statsCollector">Can be null if stats collection is not required.</param>
         public LocalUserServices(NetworkServersInfo serversInfo, uint defaultHomeLocX, uint defaultHomeLocY,
-                                 IInventoryServices inventoryService, UserStatsReporter statsCollector)
-            : base(statsCollector)
+                                 IInventoryServices inventoryService)
         {
             m_serversInfo = serversInfo;
 
@@ -103,4 +102,4 @@ namespace OpenSim.Region.Communications.Local
             return data;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs
index ff29b11..6c18540 100644
--- a/OpenSim/Region/Examples/SimpleApp/Program.cs
+++ b/OpenSim/Region/Examples/SimpleApp/Program.cs
@@ -77,7 +77,7 @@ namespace SimpleApp
 
             LocalUserServices userService =
                 new LocalUserServices(m_networkServersInfo, m_networkServersInfo.DefaultHomeLocX,
-                                      m_networkServersInfo.DefaultHomeLocY, inventoryService, null);
+                                      m_networkServersInfo.DefaultHomeLocY, inventoryService);
             userService.AddPlugin(m_userPlugin);
 
             LocalBackEndServices backendService = new LocalBackEndServices();
@@ -89,7 +89,7 @@ namespace SimpleApp
 
             LocalLoginService loginService =
                 new LocalLoginService(
-                    userService, String.Empty, localComms, m_networkServersInfo, null, false);
+                    userService, String.Empty, localComms, m_networkServersInfo, false);
             loginService.OnLoginToRegion += backendService.AddNewSession;
 
             m_httpServer.AddXmlRPCHandler("login_to_simulator", loginService.XmlRpcLoginMethod);
-- 
cgit v1.1