OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

*Fixed master avatar requesting when in grid mode.

afrisby
mingchen 2007-07-15 21:21:14 +00:00
parent bf2f3ea29a
commit 173c5ee79e
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Framework/UserManager/UserManagerBase.cs
View File

@ -119,6 +119,7 @@ namespace OpenSim.Framework.UserManagement
} }
catch (Exception e) catch (Exception e)
{ {
System.Console.WriteLine("EEK!");
MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")"); 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_y"] = profile.homeLookAt.Y.ToString();
responseData["home_look_z"] = profile.homeLookAt.Z.ToString(); responseData["home_look_z"] = profile.homeLookAt.Z.ToString();
response.Value = responseData; response.Value = responseData;
return response; return response;
} }
@ -585,7 +587,6 @@ namespace OpenSim.Framework.UserManagement
XmlRpcResponse response = new XmlRpcResponse(); XmlRpcResponse response = new XmlRpcResponse();
Hashtable requestData = (Hashtable)request.Params[0]; Hashtable requestData = (Hashtable)request.Params[0];
UserProfileData userProfile; UserProfileData userProfile;
if (requestData.Contains("avatar_name")) if (requestData.Contains("avatar_name"))
{ {
userProfile = getUserProfile((string)requestData["avatar_name"]); userProfile = getUserProfile((string)requestData["avatar_name"]);
@ -599,7 +600,6 @@ namespace OpenSim.Framework.UserManagement
return CreateUnknownUserErrorResponse(); return CreateUnknownUserErrorResponse();
} }
return ProfileToXmlRPCResponse(userProfile); return ProfileToXmlRPCResponse(userProfile);
} }
@ -608,6 +608,7 @@ namespace OpenSim.Framework.UserManagement
XmlRpcResponse response = new XmlRpcResponse(); XmlRpcResponse response = new XmlRpcResponse();
Hashtable requestData = (Hashtable)request.Params[0]; Hashtable requestData = (Hashtable)request.Params[0];
UserProfileData userProfile; UserProfileData userProfile;
System.Console.WriteLine("METHOD BY UUID CALLED");
if (requestData.Contains("avatar_uuid")) if (requestData.Contains("avatar_uuid"))
{ {
userProfile = getUserProfile((LLUUID)requestData["avatar_uuid"]); userProfile = getUserProfile((LLUUID)requestData["avatar_uuid"]);

6
OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
View File

@ -95,11 +95,7 @@ namespace OpenSim.Region.Communications.OGS1
public UserProfileData SetupMasterUser(string firstName, string lastName, string password) public UserProfileData SetupMasterUser(string firstName, string lastName, string password)
{ {
UserProfileData profile = GetUserProfile(firstName, lastName); UserProfileData profile = GetUserProfile(firstName, lastName);
if (profile == null) return profile;
{
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;
} }
} }
} }