From 0862627b341641ec0223bb4191dfee8d85724c9e Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Fri, 28 Nov 2008 15:34:30 +0000
Subject: * refactor: move CreateUser into UserServiceAdmin

---
 .../Environment/Modules/InterGrid/OpenGridProtocolModule.cs       | 6 ++++--
 OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs       | 3 ++-
 .../Region/Environment/Scenes/Tests/TestCommunicationsManager.cs  | 8 ++++----
 3 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'OpenSim/Region/Environment')

diff --git a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs
index e3e69b0..a855617 100644
--- a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs
+++ b/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs
@@ -530,7 +530,10 @@ 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.AddUser(agentData.firstname, agentData.lastname, CreateRandomStr(7), "", homeScene.RegionInfo.RegionLocX, homeScene.RegionInfo.RegionLocY, agentData.AgentID);
+                homeScene.CommsManager.UserServiceAdmin.AddUser(
+                    agentData.firstname, agentData.lastname, CreateRandomStr(7), "", 
+                    homeScene.RegionInfo.RegionLocX, homeScene.RegionInfo.RegionLocY, agentData.AgentID);
+                
                 UserProfileData userProfile2 = homeScene.CommsManager.UserService.GetUserProfile(agentData.AgentID);
                 if (userProfile2 != null)
                 {
@@ -539,7 +542,6 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
                     userProfile.FirstLifeAboutText = "OGP USER";
                     homeScene.CommsManager.UserService.UpdateUserProfile(userProfile);
                 }
-
             }
             
             // Stick our data in the cache so the region will know something about us
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
             ((LocalInventoryService)scene.CommsManager.InventoryService).AddPlugin(new TestInventoryDataPlugin());
             
             Assert.That(
-                scene.CommsManager.AddUser("Bob", "Hoskins", "test", "test@test.com", 1000, 1000, agentId),
+                scene.CommsManager.UserServiceAdmin.AddUser(
+                    "Bob", "Hoskins", "test", "test@test.com", 1000, 1000, agentId),
                 Is.EqualTo(agentId));  
             
             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
         public TestCommunicationsManager()
             : base(null, null, null, false, null)
         {
-            LocalUserServices lus = new LocalUserServices(null, 991, 992, null);
-            m_userService = lus;
-            m_userServiceAdmin = lus;
-            
             LocalInventoryService lis = new LocalInventoryService();
             m_interServiceInventoryService = lis;
             AddInventoryService(lis);
+            
+            LocalUserServices lus = new LocalUserServices(null, 991, 992, lis);
+            m_userService = lus;
+            m_userServiceAdmin = lus;           
         }
     }
 }
-- 
cgit v1.1