Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-05-09 17:04:23 +01:00
16 changed files with 149 additions and 157 deletions

View File

@@ -4108,8 +4108,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
UserAccount account = World.UserAccountService.GetUserAccount(World.RegionInfo.ScopeID, uuid);
PresenceInfo pinfo = null;
PresenceInfo[] pinfos = World.PresenceService.GetAgents(new string[] { uuid.ToString() });
PresenceInfo pinfo = PresenceInfo.GetOnlinePresence(pinfos);
if (pinfos != null && pinfos.Length > 0)
pinfo = pinfos[0];
if (pinfo == null)
return UUID.Zero.ToString();