From 171015f65fc2226b92b0f881a49e0110445e5045 Mon Sep 17 00:00:00 2001
From: MW
Date: Tue, 3 Mar 2009 15:41:21 +0000
Subject: Moved Linden protocol login handling to modules in
 OpenSim.Client.Linden. There are two region modules in there
 LLStandaloneLoginModule (for standalone mode) and LLProxyLoginModule (for
 grid mode which just handles incoming expect_user and logoff_user messages
 from the remote login server) Changed
 OpenSim.Framework.Communications.Tests.LoginServiceTests to use the
 LLStandaloneLoginService (from the LLStandaloneLoginModule) rather than
 LocalLoginService. Really these login tests should most likely be somewhere
 else as they are testing specific implementations of login services.
 Commented out the old LocalLoginService as its no longer used, but want to
 check there are no problems before it gets deleted.

---
 .../CreateCommsManager/CreateCommsManagerPlugin.cs | 33 +++++++++++-----------
 1 file changed, 16 insertions(+), 17 deletions(-)

(limited to 'OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs')

diff --git a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
index 7323ad7..e6b4a89 100644
--- a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
+++ b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
@@ -176,7 +176,7 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
 
             LocalBackEndServices backendService = new LocalBackEndServices();
 
-            LocalLoginService loginService = CreateLoginService(libraryRootFolder, inventoryService, userService, backendService);
+            //LocalLoginService loginService = CreateLoginService(libraryRootFolder, inventoryService, userService, backendService);
 
             m_commsManager
                 = new CommunicationsLocal(
@@ -207,10 +207,9 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
                      m_openSim.NetServersInfo.DefaultHomeLocX, m_openSim.NetServersInfo.DefaultHomeLocY, inventoryService);
             userService.AddPlugin(m_openSim.ConfigurationSettings.StandaloneUserPlugin, m_openSim.ConfigurationSettings.StandaloneUserSource);
 
-            //LocalBackEndServices backendService = new LocalBackEndServices();
             HGGridServicesStandalone gridService = new HGGridServicesStandalone(m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache, m_openSim.SceneManager);
 
-            LocalLoginService loginService = CreateLoginService(libraryRootFolder, inventoryService, userService, gridService.LocalBackend);
+          //  LocalLoginService loginService = CreateLoginService(libraryRootFolder, inventoryService, userService, gridService.LocalBackend);
 
             m_commsManager = new HGCommunicationsStandalone(m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache,
                 userService, userService, inventoryService, gridService, userService, libraryRootFolder, m_openSim.ConfigurationSettings.DumpAssetsToFile);
@@ -231,24 +230,24 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
             m_httpServer.AddStreamHandler(new OpenSim.SimStatusHandler());
         }
 
-        private LocalLoginService CreateLoginService(LibraryRootFolder libraryRootFolder, IInterServiceInventoryServices inventoryService, LocalUserServices userService, LocalBackEndServices backendService)
-        {
-            LocalLoginService loginService =
-                new LocalLoginService(
-                    userService, m_openSim.ConfigurationSettings.StandaloneWelcomeMessage, inventoryService, backendService, m_openSim.NetServersInfo,
-                    m_openSim.ConfigurationSettings.StandaloneAuthenticate, libraryRootFolder);
+        //private LocalLoginService CreateLoginService(LibraryRootFolder libraryRootFolder, IInterServiceInventoryServices inventoryService, LocalUserServices userService, LocalBackEndServices backendService)
+        //{
+        //    LocalLoginService loginService =
+        //        new LocalLoginService(
+        //            userService, m_openSim.ConfigurationSettings.StandaloneWelcomeMessage, inventoryService, backendService, m_openSim.NetServersInfo,
+        //            m_openSim.ConfigurationSettings.StandaloneAuthenticate, libraryRootFolder);
 
-            // set up XMLRPC handler for client's initial login request message
-            m_httpServer.AddXmlRPCHandler("login_to_simulator", loginService.XmlRpcLoginMethod);
+        //    // set up XMLRPC handler for client's initial login request message
+        //    m_httpServer.AddXmlRPCHandler("login_to_simulator", loginService.XmlRpcLoginMethod);
 
-            // provides the web form login
-            m_httpServer.AddHTTPHandler("login", loginService.ProcessHTMLLogin);
+        //    // provides the web form login
+        //    m_httpServer.AddHTTPHandler("login", loginService.ProcessHTMLLogin);
 
-            // Provides the LLSD login
-            m_httpServer.SetDefaultLLSDHandler(loginService.LLSDLoginMethod);
+        //    // Provides the LLSD login
+        //    m_httpServer.SetDefaultLLSDHandler(loginService.LLSDLoginMethod);
 
-            return loginService;
-        }
+        //    return loginService;
+        //}
 
         private void CreateGridInfoService()
         {
-- 
cgit v1.1