From 18974b77668553a9fd1bba0b646bfc7a0d788bcb Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Fri, 28 Nov 2008 16:04:01 +0000 Subject: * refactor: rename UserServiceAdmin to UserAdminService --- OpenSim/Region/Application/OpenSim.cs | 4 ++-- OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs | 3 +-- OpenSim/Region/Communications/Local/CommunicationsLocal.cs | 4 ++-- .../Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs | 2 +- OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs | 2 +- OpenSim/Region/Environment/Scenes/Tests/TestCommunicationsManager.cs | 2 +- 6 files changed, 8 insertions(+), 9 deletions(-) (limited to 'OpenSim/Region') diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 316cad5..1999737 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs @@ -800,7 +800,7 @@ namespace OpenSim if (null == m_commsManager.UserService.GetUserProfile(firstName, lastName)) { - m_commsManager.UserServiceAdmin.AddUser(firstName, lastName, password, email, regX, regY); + m_commsManager.UserAdminService.AddUser(firstName, lastName, password, email, regX, regY); } else { @@ -830,7 +830,7 @@ namespace OpenSim newPassword = MainConsole.Instance.PasswdPrompt("New password"); else newPassword = cmdparams[4]; - m_commsManager.UserServiceAdmin.ResetUserPassword(firstName, lastName, newPassword); + m_commsManager.UserAdminService.ResetUserPassword(firstName, lastName, newPassword); } protected void SaveXml(string[] cmdparams) 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 BaseHttpServer httpServer, AssetCache assetCache, IUserService userService, - IUserServiceAdmin userServiceAdmin, + IUserAdminService userServiceAdmin, LocalInventoryService inventoryService, IInterRegionCommunications interRegionService, HGGridServices gridService, IMessagingService messageService, LibraryRootFolder libraryRootFolder, bool dumpAssetsToFile) @@ -54,6 +54,5 @@ namespace OpenSim.Region.Communications.Hypergrid AddSecureInventoryService((ISecureInventoryService)inventoryService); m_inventoryServices = null; } - } } 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 BaseHttpServer httpServer, AssetCache assetCache, IUserService userService, - IUserServiceAdmin userServiceAdmin, + IUserAdminService userServiceAdmin, LocalInventoryService inventoryService, IInterRegionCommunications interRegionService, IGridServices gridService, IMessagingService messageService, @@ -50,7 +50,7 @@ namespace OpenSim.Region.Communications.Local m_defaultInventoryHost = inventoryService.Host; m_interServiceInventoryService = inventoryService; m_userService = userService; - m_userServiceAdmin = userServiceAdmin; + m_userAdminService = userServiceAdmin; m_avatarService = (IAvatarService)userService; m_gridService = gridService; m_interRegion = interRegionService; diff --git a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs index a855617..cbc4615 100644 --- a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs +++ b/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs @@ -530,7 +530,7 @@ namespace OpenSim.Region.Environment.Modules.InterGrid // get seed capagentData.firstname = FirstName;agentData.lastname = LastName; if (homeScene.CommsManager.UserService.GetUserProfile(agentData.AgentID) == null && !GridMode) { - homeScene.CommsManager.UserServiceAdmin.AddUser( + homeScene.CommsManager.UserAdminService.AddUser( agentData.firstname, agentData.lastname, CreateRandomStr(7), "", homeScene.RegionInfo.RegionLocX, homeScene.RegionInfo.RegionLocY, agentData.AgentID); diff --git a/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs b/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs index 6577fe3..7391696 100644 --- a/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs +++ b/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs @@ -105,7 +105,7 @@ namespace OpenSim.Region.Environment.Scenes.Tests ((LocalInventoryService)scene.CommsManager.InventoryService).AddPlugin(new TestInventoryDataPlugin()); Assert.That( - scene.CommsManager.UserServiceAdmin.AddUser( + scene.CommsManager.UserAdminService.AddUser( "Bob", "Hoskins", "test", "test@test.com", 1000, 1000, agentId), Is.EqualTo(agentId)); diff --git a/OpenSim/Region/Environment/Scenes/Tests/TestCommunicationsManager.cs b/OpenSim/Region/Environment/Scenes/Tests/TestCommunicationsManager.cs index 1607e03..cf7ba19 100644 --- a/OpenSim/Region/Environment/Scenes/Tests/TestCommunicationsManager.cs +++ b/OpenSim/Region/Environment/Scenes/Tests/TestCommunicationsManager.cs @@ -44,7 +44,7 @@ namespace OpenSim.Region.Environment.Scenes.Tests LocalUserServices lus = new LocalUserServices(991, 992, lis); m_userService = lus; - m_userServiceAdmin = lus; + m_userAdminService = lus; } } } -- cgit v1.1