Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
commit
864a86983e
|
@ -315,11 +315,15 @@ namespace OpenSim.Services.Connectors.SimianGrid
|
||||||
|
|
||||||
UUID userID = new UUID(user);
|
UUID userID = new UUID(user);
|
||||||
OSDMap userResponse = GetUserData(userID);
|
OSDMap userResponse = GetUserData(userID);
|
||||||
if (userResponse != null)
|
|
||||||
|
if (userResponse == null)
|
||||||
|
{
|
||||||
|
m_log.WarnFormat("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve user data for {0}", userID);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Note that ResponseToGridUserInfo properly checks for and returns a null if passed a null.
|
||||||
return ResponseToGridUserInfo(userResponse);
|
return ResponseToGridUserInfo(userResponse);
|
||||||
|
|
||||||
m_log.WarnFormat("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve user data for {0}: {1}",userID,userResponse["Message"].AsString());
|
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
Loading…
Reference in New Issue