aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
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/Environment
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/Environment')
-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
3 files changed, 3 insertions, 3 deletions
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}