From 342126b7b9ca386f9160daecb51ecc14487a5f9f Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Wed, 22 Apr 2009 22:19:43 +0000
Subject: * Resolve http://opensimulator.org/mantis/view.php?id=3509 by putting
 some service initialization into CommsManager * What is really needed is a
 plugin and interface request system as being done for region modules

---
 .../Communications/Local/CommunicationsLocal.cs    | 24 ++++++++++++++--------
 .../Communications/Local/LocalUserServices.cs      |  6 +++---
 2 files changed, 18 insertions(+), 12 deletions(-)

(limited to 'OpenSim/Region/Communications/Local')

diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
index 59a1293..c17f799 100644
--- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
+++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
@@ -35,24 +35,30 @@ namespace OpenSim.Region.Communications.Local
     public class CommunicationsLocal : CommunicationsManager
     {
         public CommunicationsLocal(
+            ConfigSettings configSettings,                                   
             NetworkServersInfo serversInfo,
             BaseHttpServer httpServer,
             IAssetCache assetCache,
-            IUserService userService,
-            IUserAdminService userServiceAdmin,
             LocalInventoryService inventoryService,
-            IGridServices gridService, IMessagingService messageService,
-            LibraryRootFolder libraryRootFolder, bool dumpAssetsToFile)
+            IGridServices gridService,
+            LibraryRootFolder libraryRootFolder, 
+            bool dumpAssetsToFile)
             : base(serversInfo, httpServer, assetCache, dumpAssetsToFile, libraryRootFolder)
         {
             AddInventoryService(inventoryService);
             m_defaultInventoryHost = inventoryService.Host;
             m_interServiceInventoryService = inventoryService;
-            m_userService = userService;
-            m_userAdminService = userServiceAdmin;
-            m_avatarService = (IAvatarService)userService;
-            m_gridService = gridService;
-            m_messageService = messageService;
+                        
+            LocalUserServices lus 
+                = new LocalUserServices(
+                    serversInfo.DefaultHomeLocX, serversInfo.DefaultHomeLocY, this);
+            lus.AddPlugin(configSettings.StandaloneUserPlugin, configSettings.StandaloneUserSource);            
+            m_userService = lus;
+            m_userAdminService = lus;            
+            m_avatarService = lus;
+            m_messageService = lus;
+            
+            m_gridService = gridService;            
         }
     }
 }
diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs
index eb60610..7412500 100644
--- a/OpenSim/Region/Communications/Local/LocalUserServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs
@@ -45,10 +45,10 @@ namespace OpenSim.Region.Communications.Local
         /// </summary>
         /// <param name="defaultHomeLocX"></param>
         /// <param name="defaultHomeLocY"></param>
-        /// <param name="inventoryService"></param>
+        /// <param name="commsManager"></param>
         public LocalUserServices(
-            uint defaultHomeLocX, uint defaultHomeLocY, IInterServiceInventoryServices interServiceInventoryService)
-            : base(interServiceInventoryService)
+            uint defaultHomeLocX, uint defaultHomeLocY, CommunicationsManager commsManager)
+            : base(commsManager)
         {
             m_defaultHomeX = defaultHomeLocX;
             m_defaultHomeY = defaultHomeLocY;
-- 
cgit v1.1