From c2ee26399947be5e3c23ac3abc53f2ba907ff10f Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Mon, 15 Sep 2008 18:23:36 +0000
Subject: * refactor: Break out IUserServiceAdmin out of IUserService since
 admin methods don't need to be implemented on Grid hosted region servers

---
 OpenSim/Region/Application/OpenSimBase.cs                  | 2 +-
 OpenSim/Region/Communications/Local/CommunicationsLocal.cs | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 1029d90..4a02264 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -383,7 +383,7 @@ namespace OpenSim
                 LocalBackEndServices backendService = new LocalBackEndServices();
 
                 CommunicationsLocal localComms =
-                    new CommunicationsLocal(m_networkServersInfo, m_httpServer, m_assetCache, userService,
+                    new CommunicationsLocal(m_networkServersInfo, m_httpServer, m_assetCache, userService, userService,
                                             inventoryService, backendService, backendService, m_dumpAssetsToFile);
                 m_commsManager = localComms;
 
diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
index 6793889..c79979c 100644
--- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
+++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
@@ -39,6 +39,7 @@ namespace OpenSim.Region.Communications.Local
             BaseHttpServer httpServer,
             AssetCache assetCache,
             IUserService userService,
+            IUserServiceAdmin userServiceAdmin,
             LocalInventoryService inventoryService,
             IInterRegionCommunications interRegionService,
             IGridServices gridService, bool dumpAssetsToFile)
@@ -48,6 +49,7 @@ namespace OpenSim.Region.Communications.Local
             m_defaultInventoryHost = inventoryService.Host;
             m_interServiceInventoryService = inventoryService;
             m_userService = userService;
+            m_userServiceAdmin = userServiceAdmin;
             m_avatarService = (IAvatarService)userService;
             m_gridService = gridService;
             m_interRegion = interRegionService;
-- 
cgit v1.1