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

some more wrapping of errors in user service on appearance for 

safety
0.6.0-stable
Sean Dague 2008-05-16 18:40:16 +00:00
parent a5fb011041
commit 843be1e93d
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,20 +89,26 @@ namespace OpenSim.Region.Communications.OGS1
public AvatarAppearance ConvertXMLRPCDataToAvatarAppearance(Hashtable data)
{
if (data.Contains("error_type"))
if (data != null)
{
m_log.Warn("[GRID]: " +
"Error sent by user server when trying to get user appearance: (" +
data["error_type"] +
"): " + data["error_desc"]);
return null;
if (data.Contains("error_type"))
{
m_log.Warn("[GRID]: " +
"Error sent by user server when trying to get user appearance: (" +
data["error_type"] +
"): " + data["error_desc"]);
return new AvatarAppearance();
}
else
{
return new AvatarAppearance(data);
}
}
else
{
return new AvatarAppearance(data);
m_log.Error("[GRID]: The avatar appearance is null, something bad happenend");
return new AvatarAppearance();
}
return null;
}
public List<AvatarPickerAvatar> ConvertXMLRPCDataToAvatarPickerList(LLUUID queryID, Hashtable data)