aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
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
parent* refactor: move ResetUserPassword into UserServiceAdmin (diff)
downloadopensim-SC_OLD-18974b77668553a9fd1bba0b646bfc7a0d788bcb.zip
opensim-SC_OLD-18974b77668553a9fd1bba0b646bfc7a0d788bcb.tar.gz
opensim-SC_OLD-18974b77668553a9fd1bba0b646bfc7a0d788bcb.tar.bz2
opensim-SC_OLD-18974b77668553a9fd1bba0b646bfc7a0d788bcb.tar.xz
* refactor: rename UserServiceAdmin to UserAdminService
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Application/OpenSim.cs4
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs3
-rw-r--r--OpenSim/Region/Communications/Local/CommunicationsLocal.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Tests/TestCommunicationsManager.cs2
6 files changed, 8 insertions, 9 deletions
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
800 800
801 if (null == m_commsManager.UserService.GetUserProfile(firstName, lastName)) 801 if (null == m_commsManager.UserService.GetUserProfile(firstName, lastName))
802 { 802 {
803 m_commsManager.UserServiceAdmin.AddUser(firstName, lastName, password, email, regX, regY); 803 m_commsManager.UserAdminService.AddUser(firstName, lastName, password, email, regX, regY);
804 } 804 }
805 else 805 else
806 { 806 {
@@ -830,7 +830,7 @@ namespace OpenSim
830 newPassword = MainConsole.Instance.PasswdPrompt("New password"); 830 newPassword = MainConsole.Instance.PasswdPrompt("New password");
831 else newPassword = cmdparams[4]; 831 else newPassword = cmdparams[4];
832 832
833 m_commsManager.UserServiceAdmin.ResetUserPassword(firstName, lastName, newPassword); 833 m_commsManager.UserAdminService.ResetUserPassword(firstName, lastName, newPassword);
834 } 834 }
835 835
836 protected void SaveXml(string[] cmdparams) 836 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
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;
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
530 // get seed capagentData.firstname = FirstName;agentData.lastname = LastName; 530 // get seed capagentData.firstname = FirstName;agentData.lastname = LastName;
531 if (homeScene.CommsManager.UserService.GetUserProfile(agentData.AgentID) == null && !GridMode) 531 if (homeScene.CommsManager.UserService.GetUserProfile(agentData.AgentID) == null && !GridMode)
532 { 532 {
533 homeScene.CommsManager.UserServiceAdmin.AddUser( 533 homeScene.CommsManager.UserAdminService.AddUser(
534 agentData.firstname, agentData.lastname, CreateRandomStr(7), "", 534 agentData.firstname, agentData.lastname, CreateRandomStr(7), "",
535 homeScene.RegionInfo.RegionLocX, homeScene.RegionInfo.RegionLocY, agentData.AgentID); 535 homeScene.RegionInfo.RegionLocX, homeScene.RegionInfo.RegionLocY, agentData.AgentID);
536 536
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
105 ((LocalInventoryService)scene.CommsManager.InventoryService).AddPlugin(new TestInventoryDataPlugin()); 105 ((LocalInventoryService)scene.CommsManager.InventoryService).AddPlugin(new TestInventoryDataPlugin());
106 106
107 Assert.That( 107 Assert.That(
108 scene.CommsManager.UserServiceAdmin.AddUser( 108 scene.CommsManager.UserAdminService.AddUser(
109 "Bob", "Hoskins", "test", "test@test.com", 1000, 1000, agentId), 109 "Bob", "Hoskins", "test", "test@test.com", 1000, 1000, agentId),
110 Is.EqualTo(agentId)); 110 Is.EqualTo(agentId));
111 111
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
44 44
45 LocalUserServices lus = new LocalUserServices(991, 992, lis); 45 LocalUserServices lus = new LocalUserServices(991, 992, lis);
46 m_userService = lus; 46 m_userService = lus;
47 m_userServiceAdmin = lus; 47 m_userAdminService = lus;
48 } 48 }
49 } 49 }
50} 50}