Merge branch 'master' into careminster

This commit is contained in:
Melanie
2013-07-04 22:32:58 +01:00
31 changed files with 398 additions and 190 deletions

View File

@@ -185,10 +185,12 @@ namespace OpenSim.Server.Handlers.GridUser
GridUserInfo guinfo = m_GridUserService.GetGridUserInfo(user);
Dictionary<string, object> result = new Dictionary<string, object>();
result["result"] = guinfo.ToKeyValuePairs();
if (guinfo != null)
result["result"] = guinfo.ToKeyValuePairs();
else
result["result"] = "null";
string xmlString = ServerUtils.BuildXmlResponse(result);
//m_log.DebugFormat("[GRID USER HANDLER]: resp string: {0}", xmlString);
return Util.UTF8NoBomEncoding.GetBytes(xmlString);
}