From 173c5ee79eb167c929fef9da05d984541775915f Mon Sep 17 00:00:00 2001
From: mingchen <mingchen>
Date: Sun, 15 Jul 2007 21:21:14 +0000
Subject: [PATCH] *Fixed master avatar requesting when in grid mode.

---
 OpenSim/Framework/UserManager/UserManagerBase.cs       | 5 +++--
 OpenSim/Region/Communications/OGS1/OGS1UserServices.cs | 6 +-----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/OpenSim/Framework/UserManager/UserManagerBase.cs b/OpenSim/Framework/UserManager/UserManagerBase.cs
index df6fbb281c..4e688f79a9 100644
--- a/OpenSim/Framework/UserManager/UserManagerBase.cs
+++ b/OpenSim/Framework/UserManager/UserManagerBase.cs
@@ -119,6 +119,7 @@ namespace OpenSim.Framework.UserManagement
                 }
                 catch (Exception e)
                 {
+                    System.Console.WriteLine("EEK!");
                     MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
                 }
             }
@@ -575,6 +576,7 @@ namespace OpenSim.Framework.UserManagement
             responseData["home_look_y"] = profile.homeLookAt.Y.ToString();
             responseData["home_look_z"] = profile.homeLookAt.Z.ToString();
             response.Value = responseData;
+
             return response;
         }
 
@@ -585,7 +587,6 @@ namespace OpenSim.Framework.UserManagement
             XmlRpcResponse response = new XmlRpcResponse();
             Hashtable requestData = (Hashtable)request.Params[0];
             UserProfileData userProfile;
-
             if (requestData.Contains("avatar_name"))
             {
                 userProfile = getUserProfile((string)requestData["avatar_name"]);
@@ -598,7 +599,6 @@ namespace OpenSim.Framework.UserManagement
             {
                 return CreateUnknownUserErrorResponse();
             }
-            
 
             return ProfileToXmlRPCResponse(userProfile);
         }
@@ -608,6 +608,7 @@ namespace OpenSim.Framework.UserManagement
             XmlRpcResponse response = new XmlRpcResponse();
             Hashtable requestData = (Hashtable)request.Params[0];
             UserProfileData userProfile;
+            System.Console.WriteLine("METHOD BY UUID CALLED");
             if (requestData.Contains("avatar_uuid"))
             {
                 userProfile = getUserProfile((LLUUID)requestData["avatar_uuid"]);
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index 2bbaf9df61..46d71c4539 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -95,11 +95,7 @@ namespace OpenSim.Region.Communications.OGS1
         public UserProfileData SetupMasterUser(string firstName, string lastName, string password)
         {
             UserProfileData profile = GetUserProfile(firstName, lastName);
-            if (profile == null)
-            {
-                Console.WriteLine("Unknown Master User. Grid Mode: No clue what I should do. Probably would choose the grid owner UUID when that is implemented");
-            }
-            return null;
+            return profile;
         }
     }
 }