From 63851f14417e8027d51150daa93413b1bc6888ed Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey <jjustincc@googlemail.com>
Date: Fri, 28 Nov 2008 15:47:01 +0000
Subject: [PATCH] * refactor: move ResetUserPassword into UserServiceAdmin

---
 .../Communications/CommunicationsManager.cs          | 12 ------------
 OpenSim/Region/Application/HGOpenSimNode.cs          |  1 -
 OpenSim/Region/Application/OpenSim.cs                |  2 +-
 3 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index a5ead3f0dc..c4adfa5a1c 100644
--- a/OpenSim/Framework/Communications/CommunicationsManager.cs
+++ b/OpenSim/Framework/Communications/CommunicationsManager.cs
@@ -251,18 +251,6 @@ namespace OpenSim.Framework.Communications
         }
 
         #endregion
-        
-        /// <summary>
-        /// Reset a user password
-        /// </summary>
-        /// <param name="firstName"></param>
-        /// <param name="lastName"></param>
-        /// <param name="newPassword"></param>
-        /// <returns>true if the update was successful, false otherwise</returns>
-        public bool ResetUserPassword(string firstName, string lastName, string newPassword)
-        {
-            return m_userServiceAdmin.ResetUserPassword(firstName, lastName, newPassword);
-        }
 
         #region Friend Methods
 
diff --git a/OpenSim/Region/Application/HGOpenSimNode.cs b/OpenSim/Region/Application/HGOpenSimNode.cs
index 8f6fd5e124..4f355cf919 100644
--- a/OpenSim/Region/Application/HGOpenSimNode.cs
+++ b/OpenSim/Region/Application/HGOpenSimNode.cs
@@ -73,7 +73,6 @@ namespace OpenSim
             base.StartupSpecific();
         }
 
-
         protected override void InitialiseStandaloneServices(LibraryRootFolder libraryRootFolder)
         {
             // Standalone mode
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index d29d0e41fc..316cad5d1c 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -830,7 +830,7 @@ namespace OpenSim
                 newPassword = MainConsole.Instance.PasswdPrompt("New password");
             else newPassword = cmdparams[4];
             
-            m_commsManager.ResetUserPassword(firstName, lastName, newPassword);
+            m_commsManager.UserServiceAdmin.ResetUserPassword(firstName, lastName, newPassword);
         }                        
 
         protected void SaveXml(string[] cmdparams)