diff options
author | Justin Clarke Casey | 2008-11-28 15:34:30 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-11-28 15:34:30 +0000 |
commit | 0862627b341641ec0223bb4191dfee8d85724c9e (patch) | |
tree | ef1815b067c345aa92a81375f12137a3e47876f3 /OpenSim/Region/Environment/Scenes | |
parent | * Changed name of auth function to better reflect actual use (diff) | |
download | opensim-SC-0862627b341641ec0223bb4191dfee8d85724c9e.zip opensim-SC-0862627b341641ec0223bb4191dfee8d85724c9e.tar.gz opensim-SC-0862627b341641ec0223bb4191dfee8d85724c9e.tar.bz2 opensim-SC-0862627b341641ec0223bb4191dfee8d85724c9e.tar.xz |
* refactor: move CreateUser into UserServiceAdmin
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Tests/TestCommunicationsManager.cs | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs b/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs index 7f6fa3c..6577fe3 100644 --- a/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs +++ b/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs | |||
@@ -105,7 +105,8 @@ 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.AddUser("Bob", "Hoskins", "test", "test@test.com", 1000, 1000, agentId), | 108 | scene.CommsManager.UserServiceAdmin.AddUser( |
109 | "Bob", "Hoskins", "test", "test@test.com", 1000, 1000, agentId), | ||
109 | Is.EqualTo(agentId)); | 110 | Is.EqualTo(agentId)); |
110 | 111 | ||
111 | IClientAPI client = SceneTestUtils.AddRootAgent(scene, agentId); | 112 | IClientAPI client = SceneTestUtils.AddRootAgent(scene, agentId); |
diff --git a/OpenSim/Region/Environment/Scenes/Tests/TestCommunicationsManager.cs b/OpenSim/Region/Environment/Scenes/Tests/TestCommunicationsManager.cs index 07cd429..b9804d9 100644 --- a/OpenSim/Region/Environment/Scenes/Tests/TestCommunicationsManager.cs +++ b/OpenSim/Region/Environment/Scenes/Tests/TestCommunicationsManager.cs | |||
@@ -38,13 +38,13 @@ namespace OpenSim.Region.Environment.Scenes.Tests | |||
38 | public TestCommunicationsManager() | 38 | public TestCommunicationsManager() |
39 | : base(null, null, null, false, null) | 39 | : base(null, null, null, false, null) |
40 | { | 40 | { |
41 | LocalUserServices lus = new LocalUserServices(null, 991, 992, null); | ||
42 | m_userService = lus; | ||
43 | m_userServiceAdmin = lus; | ||
44 | |||
45 | LocalInventoryService lis = new LocalInventoryService(); | 41 | LocalInventoryService lis = new LocalInventoryService(); |
46 | m_interServiceInventoryService = lis; | 42 | m_interServiceInventoryService = lis; |
47 | AddInventoryService(lis); | 43 | AddInventoryService(lis); |
44 | |||
45 | LocalUserServices lus = new LocalUserServices(null, 991, 992, lis); | ||
46 | m_userService = lus; | ||
47 | m_userServiceAdmin = lus; | ||
48 | } | 48 | } |
49 | } | 49 | } |
50 | } | 50 | } |