2 files changed, 18 insertions, 12 deletions
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,
+            IGridServices gridService,
-            LibraryRootFolder libraryRootFolder, bool dumpAssetsToFile)
+            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;
+            LocalUserServices lus 
-            m_avatarService = (IAvatarService)userService;
+                = new LocalUserServices(
-            m_gridService = gridService;
+                    serversInfo.DefaultHomeLocX, serversInfo.DefaultHomeLocY, this);
-            m_messageService = messageService;
+            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)
+            uint defaultHomeLocX, uint defaultHomeLocY, CommunicationsManager commsManager)
-            : base(interServiceInventoryService)
+            : base(commsManager)
        {
            m_defaultHomeX = defaultHomeLocX;
            m_defaultHomeY = defaultHomeLocY;

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
35	public class CommunicationsLocal : CommunicationsManager	35	public class CommunicationsLocal : CommunicationsManager
36	{	36	{
37	public CommunicationsLocal(	37	public CommunicationsLocal(
		38	ConfigSettings configSettings,
38	NetworkServersInfo serversInfo,	39	NetworkServersInfo serversInfo,
39	BaseHttpServer httpServer,	40	BaseHttpServer httpServer,
40	IAssetCache assetCache,	41	IAssetCache assetCache,
41	IUserService userService,
42	IUserAdminService userServiceAdmin,
43	LocalInventoryService inventoryService,	42	LocalInventoryService inventoryService,
44	IGridServices gridService, IMessagingService messageService,	43	IGridServices gridService,
45	LibraryRootFolder libraryRootFolder, bool dumpAssetsToFile)	44	LibraryRootFolder libraryRootFolder,
		45	bool dumpAssetsToFile)
46	: base(serversInfo, httpServer, assetCache, dumpAssetsToFile, libraryRootFolder)	46	: base(serversInfo, httpServer, assetCache, dumpAssetsToFile, libraryRootFolder)
47	{	47	{
48	AddInventoryService(inventoryService);	48	AddInventoryService(inventoryService);
49	m_defaultInventoryHost = inventoryService.Host;	49	m_defaultInventoryHost = inventoryService.Host;
50	m_interServiceInventoryService = inventoryService;	50	m_interServiceInventoryService = inventoryService;
51	m_userService = userService;	51
52	m_userAdminService = userServiceAdmin;	52	LocalUserServices lus
53	m_avatarService = (IAvatarService)userService;	53	= new LocalUserServices(
54	m_gridService = gridService;	54	serversInfo.DefaultHomeLocX, serversInfo.DefaultHomeLocY, this);
55	m_messageService = messageService;	55	lus.AddPlugin(configSettings.StandaloneUserPlugin, configSettings.StandaloneUserSource);
		56	m_userService = lus;
		57	m_userAdminService = lus;
		58	m_avatarService = lus;
		59	m_messageService = lus;
		60
		61	m_gridService = gridService;
56	}	62	}
57	}	63	}
58	}	64	}


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
45	/// </summary>	45	/// </summary>
46	/// <param name="defaultHomeLocX"></param>	46	/// <param name="defaultHomeLocX"></param>
47	/// <param name="defaultHomeLocY"></param>	47	/// <param name="defaultHomeLocY"></param>
48	/// <param name="inventoryService"></param>	48	/// <param name="commsManager"></param>
49	public LocalUserServices(	49	public LocalUserServices(
50	uint defaultHomeLocX, uint defaultHomeLocY, IInterServiceInventoryServices interServiceInventoryService)	50	uint defaultHomeLocX, uint defaultHomeLocY, CommunicationsManager commsManager)
51	: base(interServiceInventoryService)	51	: base(commsManager)
52	{	52	{
53	m_defaultHomeX = defaultHomeLocX;	53	m_defaultHomeX = defaultHomeLocX;
54	m_defaultHomeY = defaultHomeLocY;	54	m_defaultHomeY = defaultHomeLocY;