aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-11-28 16:04:01 +0000
committerJustin Clarke Casey2008-11-28 16:04:01 +0000
commit18974b77668553a9fd1bba0b646bfc7a0d788bcb (patch)
treec144c255e2057a42a0a54a42d50b892e4fafb739 /OpenSim/Region/Communications
parent* refactor: move ResetUserPassword into UserServiceAdmin (diff)
downloadopensim-SC-18974b77668553a9fd1bba0b646bfc7a0d788bcb.zip
opensim-SC-18974b77668553a9fd1bba0b646bfc7a0d788bcb.tar.gz
opensim-SC-18974b77668553a9fd1bba0b646bfc7a0d788bcb.tar.bz2
opensim-SC-18974b77668553a9fd1bba0b646bfc7a0d788bcb.tar.xz
* refactor: rename UserServiceAdmin to UserAdminService
Diffstat (limited to 'OpenSim/Region/Communications')
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs3
-rw-r--r--OpenSim/Region/Communications/Local/CommunicationsLocal.cs4
2 files changed, 3 insertions, 4 deletions
diff --git a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs
index 3bf714e..804640e 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs
@@ -42,7 +42,7 @@ namespace OpenSim.Region.Communications.Hypergrid
42 BaseHttpServer httpServer, 42 BaseHttpServer httpServer,
43 AssetCache assetCache, 43 AssetCache assetCache,
44 IUserService userService, 44 IUserService userService,
45 IUserServiceAdmin userServiceAdmin, 45 IUserAdminService userServiceAdmin,
46 LocalInventoryService inventoryService, 46 LocalInventoryService inventoryService,
47 IInterRegionCommunications interRegionService, 47 IInterRegionCommunications interRegionService,
48 HGGridServices gridService, IMessagingService messageService, LibraryRootFolder libraryRootFolder, bool dumpAssetsToFile) 48 HGGridServices gridService, IMessagingService messageService, LibraryRootFolder libraryRootFolder, bool dumpAssetsToFile)
@@ -54,6 +54,5 @@ namespace OpenSim.Region.Communications.Hypergrid
54 AddSecureInventoryService((ISecureInventoryService)inventoryService); 54 AddSecureInventoryService((ISecureInventoryService)inventoryService);
55 m_inventoryServices = null; 55 m_inventoryServices = null;
56 } 56 }
57
58 } 57 }
59} 58}
diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
index 48a635a..6489408 100644
--- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
+++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
@@ -39,7 +39,7 @@ namespace OpenSim.Region.Communications.Local
39 BaseHttpServer httpServer, 39 BaseHttpServer httpServer,
40 AssetCache assetCache, 40 AssetCache assetCache,
41 IUserService userService, 41 IUserService userService,
42 IUserServiceAdmin userServiceAdmin, 42 IUserAdminService userServiceAdmin,
43 LocalInventoryService inventoryService, 43 LocalInventoryService inventoryService,
44 IInterRegionCommunications interRegionService, 44 IInterRegionCommunications interRegionService,
45 IGridServices gridService, IMessagingService messageService, 45 IGridServices gridService, IMessagingService messageService,
@@ -50,7 +50,7 @@ namespace OpenSim.Region.Communications.Local
50 m_defaultInventoryHost = inventoryService.Host; 50 m_defaultInventoryHost = inventoryService.Host;
51 m_interServiceInventoryService = inventoryService; 51 m_interServiceInventoryService = inventoryService;
52 m_userService = userService; 52 m_userService = userService;
53 m_userServiceAdmin = userServiceAdmin; 53 m_userAdminService = userServiceAdmin;
54 m_avatarService = (IAvatarService)userService; 54 m_avatarService = (IAvatarService)userService;
55 m_gridService = gridService; 55 m_gridService = gridService;
56 m_interRegion = interRegionService; 56 m_interRegion = interRegionService;