more refactoring

2 files changed, 4 insertions, 23 deletions

diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
index f51f564..7a00c5a 100644
--- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
+++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
@@ -39,34 +39,14 @@ namespace OpenSim.Region.Communications.Local
 {
     public class CommunicationsLocal : CommunicationsManager
     {
-        public CommunicationsLocal(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache, LocalSettings settings, LocalUserServices userService, LocalInventoryService inventoryService)
+        public CommunicationsLocal(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache, LocalUserServices userService, LocalInventoryService inventoryService, IInterRegionCommunications interRegionService, IGridServices gridService)
             : base(serversInfo, httpServer, assetCache)
         {
             m_inventoryService = inventoryService;
             m_userService = userService;
+            m_gridService = gridService;
+            m_interRegion = interRegionService;
 
-            LocalBackEndServices backendService = new LocalBackEndServices();
-            m_gridService = backendService;
-            m_interRegion = backendService;
-
-            LocalLoginService loginService = new LocalLoginService(userService, settings.WelcomeMessage, this, serversInfo, settings.AccountAuthentication);
-            loginService.OnLoginToRegion += backendService.AddNewSession;
-
-            httpServer.AddXmlRPCHandler("login_to_simulator", loginService.XmlRpcLoginMethod);
-        }
-
-       
-
-        public class LocalSettings
-        {
-            public string WelcomeMessage;
-            public bool AccountAuthentication = false;
-
-            public LocalSettings(string welcomeMessage, bool accountsAuthenticate)
-            {
-                WelcomeMessage = welcomeMessage;
-                AccountAuthentication = accountsAuthenticate;
-            }
         }
 
     }
diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs
index 9e81fb8..4e75eb0 100644
--- a/OpenSim/Region/Communications/Local/LocalUserServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs
@@ -22,6 +22,7 @@ namespace OpenSim.Region.Communications.Local
             m_defaultHomeY = defaultHomeLocY;
 
             m_inventoryService = inventoryService;
+            
         }
 
         public override UserProfileData SetupMasterUser(string firstName, string lastName)