Moving the LoginAuth service up, so that it can be shared among standalones and the User Server.

2 files changed, 5 insertions, 8 deletions

diff --git a/OpenSim/Region/CoreModules/Hypergrid/Login/HGStandaloneLoginService.cs b/OpenSim/Framework/Communications/HGLoginAuthService.cs
index 5ac50f1..d12b73b 100644
--- a/OpenSim/Region/CoreModules/Hypergrid/Login/HGStandaloneLoginService.cs
+++ b/OpenSim/Framework/Communications/HGLoginAuthService.cs
@@ -32,12 +32,9 @@ using System.Net;
 using System.Reflection;

 using System.Text.RegularExpressions;

 using OpenSim.Framework;

-using OpenSim.Framework.Communications;

 using OpenSim.Framework.Communications.Cache;

 using OpenSim.Framework.Communications.Capabilities;

 using OpenSim.Framework.Servers;

-using OpenSim.Region.Framework.Scenes;

-using OpenSim.Region.Framework.Interfaces;

 

 using OpenMetaverse;

 

@@ -45,9 +42,9 @@ using log4net;
 using Nini.Config;

 using Nwc.XmlRpc;

 

-namespace OpenSim.Region.CoreModules.Hypergrid

+namespace OpenSim.Framework.Communications

 {

-    public class HGStandaloneLoginService : LoginService

+    public class HGLoginAuthService : LoginService

     {

         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);

 

@@ -65,7 +62,7 @@ namespace OpenSim.Region.CoreModules.Hypergrid
         protected ILoginServiceToRegionsConnector m_regionsConnector;

 

 

-        public HGStandaloneLoginService(

+        public HGLoginAuthService(

             UserManagerBase userManager, string welcomeMess,

             IInterServiceInventoryServices interServiceInventoryService,

             NetworkServersInfo serversInfo,

diff --git a/OpenSim/Region/CoreModules/Hypergrid/Login/HGStandaloneLoginModule.cs b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs
index 4b74ed5..3f4d875 100644
--- a/OpenSim/Region/CoreModules/Hypergrid/Login/HGStandaloneLoginModule.cs
+++ b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs
@@ -69,7 +69,7 @@ namespace OpenSim.Region.CoreModules.Hypergrid
             }

         }

        

-        protected HGStandaloneLoginService m_loginService;

+        protected HGLoginAuthService m_loginService;

 

         #region IRegionModule Members

 

@@ -103,7 +103,7 @@ namespace OpenSim.Region.CoreModules.Hypergrid
                     IHttpServer httpServer = m_firstScene.CommsManager.HttpServer;

 

                     //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 = new HGStandaloneLoginService((UserManagerBase)m_firstScene.CommsManager.UserService, welcomeMessage, m_firstScene.CommsManager.InterServiceInventoryService, m_firstScene.CommsManager.NetworkServersInfo, authenticate, rootFolder, this);

+                    m_loginService = new HGLoginAuthService((UserManagerBase)m_firstScene.CommsManager.UserService, welcomeMessage, m_firstScene.CommsManager.InterServiceInventoryService, m_firstScene.CommsManager.NetworkServersInfo, authenticate, rootFolder, this);

 

                     httpServer.AddXmlRPCHandler("hg_login", m_loginService.XmlRpcLoginMethod);

                     httpServer.AddXmlRPCHandler("hg_new_auth_key", m_loginService.XmlRpcGenerateKeyMethod);