10 files changed, 19 insertions, 17 deletions

diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index 7f7689d..cf60484 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -474,7 +474,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                     {
                         m_log.InfoFormat("master avatar does not exist, creating it");
                         // ...or create new user
-                        userID = m_app.CommunicationsManager.UserServiceAdmin.AddUser(
+                        userID = m_app.CommunicationsManager.UserAdminService.AddUser(
                             masterFirst, masterLast, masterPassword, "", region.RegionLocX, region.RegionLocY);
                         
                         if (userID == UUID.Zero) throw new Exception(String.Format("failed to create new user {0} {1}",
@@ -671,7 +671,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                     throw new Exception(String.Format("avatar {0} {1} already exists", firstname, lastname));
 
                 UUID userID 
-                    = m_app.CommunicationsManager.UserServiceAdmin.AddUser(
+                    = m_app.CommunicationsManager.UserAdminService.AddUser(
                         firstname, lastname, passwd, email, regX, regY);
 
                 if (userID == UUID.Zero) throw new Exception(String.Format("failed to create new user {0} {1}",
@@ -769,7 +769,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                     throw new Exception(String.Format("avatar {0} {1} already exists", firstname, lastname));
 
                 UUID userID
-                    = m_app.CommunicationsManager.UserServiceAdmin.AddUser(
+                    = m_app.CommunicationsManager.UserAdminService.AddUser(
                         firstname, lastname, passwd, email, regX, regY);
 
                 if (userID == UUID.Zero) throw new Exception(String.Format("failed to create new user {0} {1}",
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index c4adfa5..72c01bd 100644
--- a/OpenSim/Framework/Communications/CommunicationsManager.cs
+++ b/OpenSim/Framework/Communications/CommunicationsManager.cs
@@ -108,11 +108,11 @@ namespace OpenSim.Framework.Communications
         /// <summary>
         /// Interface to user service for administrating users.
         /// </summary>
-        public IUserServiceAdmin UserServiceAdmin
+        public IUserAdminService UserAdminService
         {
-            get { return m_userServiceAdmin; }
+            get { return m_userAdminService; }
         }        
-        protected IUserServiceAdmin m_userServiceAdmin;        
+        protected IUserAdminService m_userAdminService;        
 
         public BaseHttpServer HttpServer
         {
diff --git a/OpenSim/Framework/Communications/IUserServiceAdmin.cs b/OpenSim/Framework/Communications/IUserAdminService.cs
index b1f974b..3b7ba6e 100644
--- a/OpenSim/Framework/Communications/IUserServiceAdmin.cs
+++ b/OpenSim/Framework/Communications/IUserAdminService.cs
@@ -29,7 +29,10 @@ using OpenMetaverse;
 
 namespace OpenSim.Framework.Communications
 {
-    public interface IUserServiceAdmin
+    /// <summary>
+    /// Interface for the service for administrating users
+    /// </summary>
+    public interface IUserAdminService
     {
         /// <summary>
         /// Add a new user
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index 3946ea3..8bfb2d7 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -43,7 +43,7 @@ namespace OpenSim.Framework.Communications
     /// <summary>
     /// Base class for user management (create, read, etc)
     /// </summary>
-    public abstract class UserManagerBase : IUserService, IUserServiceAdmin, IAvatarService, IMessagingService
+    public abstract class UserManagerBase : IUserService, IUserAdminService, IAvatarService, IMessagingService
     {
         private static readonly ILog m_log
             = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
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;           
         }
     }
 }