From c310fb11f492419de60b4bf8e5bb234e4589b336 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Fri, 10 Jul 2009 02:22:26 +0000
Subject: Remove all references to HttpServer from CommsManager (all
 incarnations) Change all uses of the HttpServer properties to use the new
 singleton

---
 OpenSim/Client/Linden/LLProxyLoginModule.cs      | 4 ++--
 OpenSim/Client/Linden/LLStandaloneLoginModule.cs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Client/Linden')

diff --git a/OpenSim/Client/Linden/LLProxyLoginModule.cs b/OpenSim/Client/Linden/LLProxyLoginModule.cs
index 88b7972..f7608d1 100644
--- a/OpenSim/Client/Linden/LLProxyLoginModule.cs
+++ b/OpenSim/Client/Linden/LLProxyLoginModule.cs
@@ -143,8 +143,8 @@ namespace OpenSim.Client.Linden
         protected void AddHttpHandlers()
         {
             //we will add our handlers to the first scene we received, as all scenes share a http server. But will this ever change?
-            m_firstScene.CommsManager.HttpServer.AddXmlRPCHandler("expect_user", ExpectUser);
-            m_firstScene.CommsManager.HttpServer.AddXmlRPCHandler("logoff_user", LogOffUser);
+            MainServer.Instance.AddXmlRPCHandler("expect_user", ExpectUser);
+            MainServer.Instance.AddXmlRPCHandler("logoff_user", LogOffUser);
         }
 
         protected void AddScene(Scene scene)
diff --git a/OpenSim/Client/Linden/LLStandaloneLoginModule.cs b/OpenSim/Client/Linden/LLStandaloneLoginModule.cs
index 02a3b37..21197f8 100644
--- a/OpenSim/Client/Linden/LLStandaloneLoginModule.cs
+++ b/OpenSim/Client/Linden/LLStandaloneLoginModule.cs
@@ -130,7 +130,7 @@ namespace OpenSim.Client.Linden
                     LibraryRootFolder rootFolder
                         = m_firstScene.CommsManager.UserProfileCacheService.LibraryRoot as LibraryRootFolder;
 
-                    IHttpServer httpServer = m_firstScene.CommsManager.HttpServer;
+                    IHttpServer httpServer = MainServer.Instance;
 
                     //TODO: fix the casting of the user service, maybe by registering the userManagerBase with scenes, or refactoring so we just need a IUserService reference
                     m_loginService 
-- 
cgit v1.1