* Do not allow a user to be created if one with the same name already exists

1 files changed, 18 insertions, 27 deletions

diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index dbf9276..733d62b 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -86,11 +86,24 @@ namespace OpenSim.Framework.UserManagement
 
         #region Get UserProfile 
 
-        /// <summary>
-        /// Loads a user profile from a database by UUID
-        /// </summary>
-        /// <param name="uuid">The target UUID</param>
-        /// <returns>A user profile.  Returns null if no user profile is found.</returns>
+        // see IUserService
+        public UserProfileData GetUserProfile(string fname, string lname)
+        {
+            foreach (KeyValuePair<string, IUserData> plugin in _plugins)
+            {
+                UserProfileData profile = plugin.Value.GetUserByName(fname, lname);
+
+                if (profile != null)
+                {
+                    profile.currentAgent = getUserAgent(profile.UUID);
+                    return profile;
+                }
+            }
+
+            return null;
+        }
+        
+        // see IUserService        
         public UserProfileData GetUserProfile(LLUUID uuid)
         {
             foreach (KeyValuePair<string, IUserData> plugin in _plugins)
@@ -126,28 +139,6 @@ namespace OpenSim.Framework.UserManagement
         }
 
         /// <summary>
-        /// Loads a user profile by name
-        /// </summary>
-        /// <param name="fname">First name</param>
-        /// <param name="lname">Last name</param>
-        /// <returns>A user profile.  Returns null if no profile is found</returns>
-        public UserProfileData GetUserProfile(string fname, string lname)
-        {
-            foreach (KeyValuePair<string, IUserData> plugin in _plugins)
-            {
-                UserProfileData profile = plugin.Value.GetUserByName(fname, lname);
-
-                if (profile != null)
-                {
-                    profile.currentAgent = getUserAgent(profile.UUID);
-                    return profile;
-                }
-            }
-
-            return null;
-        }
-
-        /// <summary>
         /// Set's user profile from object
         /// </summary>
         /// <param name="fname">First name</param>