Separated Login Service from usermanager, which helps to clean up the code a bit and also should help to integrate the inventory server (when it is wrote/finished).

1 files changed, 8 insertions, 6 deletions

diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
index a0bbf6d..3ad33f4 100644
--- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
+++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
@@ -37,23 +37,25 @@ namespace OpenSim.Region.Communications.Local
 {
     public class CommunicationsLocal : CommunicationsManager
     {
-        public LocalBackEndServices SandBoxServices = new LocalBackEndServices();
+        public LocalBackEndServices InstanceServices = new LocalBackEndServices();
         public LocalUserServices UserServices;
+        public LocalLoginService LoginServices;
 
         public CommunicationsLocal(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache, bool accountsAuthenticate, string welcomeMessage )
             : base(serversInfo, httpServer, assetCache)
         {
-            UserServices = new LocalUserServices(this, serversInfo, accountsAuthenticate, welcomeMessage);
+            UserServices = new LocalUserServices(this, serversInfo);
             UserServices.AddPlugin("OpenSim.Framework.Data.DB4o.dll");
             UserServer = UserServices;
-            GridServer = SandBoxServices;
-            InterRegion = SandBoxServices;
-            httpServer.AddXmlRPCHandler("login_to_simulator", UserServices.XmlRpcLoginMethod);
+            GridServer = InstanceServices;
+            InterRegion = InstanceServices;
+            LoginServices = new LocalLoginService(UserServices, welcomeMessage, this, serversInfo, accountsAuthenticate);
+            httpServer.AddXmlRPCHandler("login_to_simulator", LoginServices.XmlRpcLoginMethod);
         }
 
         internal void InformRegionOfLogin(ulong regionHandle, Login login)
         {
-            this.SandBoxServices.AddNewSession(regionHandle, login);
+            this.InstanceServices.AddNewSession(regionHandle, login);
         }
 
         public void doCreate(string what)