diff options
| author | Melanie | 2010-05-09 17:04:23 +0100 |
|---|---|---|
| committer | Melanie | 2010-05-09 17:04:23 +0100 |
| commit | 4e0d62547d2760ce48cf64373917dcfb893da543 (patch) | |
| tree | 9f84ddc57b58ed107cd6d610aaeb62039d483a71 /OpenSim/Region/ScriptEngine | |
| parent | Merge branch 'careminster' into careminster-presence-refactor (diff) | |
| parent | Add a field asset_flags and a corresponding enum to the asset database. This (diff) | |
| download | opensim-SC-4e0d62547d2760ce48cf64373917dcfb893da543.zip opensim-SC-4e0d62547d2760ce48cf64373917dcfb893da543.tar.gz opensim-SC-4e0d62547d2760ce48cf64373917dcfb893da543.tar.bz2 opensim-SC-4e0d62547d2760ce48cf64373917dcfb893da543.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 6ab3c62..ca0feed 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -4108,8 +4108,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 4108 | 4108 | ||
| 4109 | UserAccount account = World.UserAccountService.GetUserAccount(World.RegionInfo.ScopeID, uuid); | 4109 | UserAccount account = World.UserAccountService.GetUserAccount(World.RegionInfo.ScopeID, uuid); |
| 4110 | 4110 | ||
| 4111 | PresenceInfo pinfo = null; | ||
| 4111 | PresenceInfo[] pinfos = World.PresenceService.GetAgents(new string[] { uuid.ToString() }); | 4112 | PresenceInfo[] pinfos = World.PresenceService.GetAgents(new string[] { uuid.ToString() }); |
| 4112 | PresenceInfo pinfo = PresenceInfo.GetOnlinePresence(pinfos); | 4113 | if (pinfos != null && pinfos.Length > 0) |
| 4114 | pinfo = pinfos[0]; | ||
| 4113 | 4115 | ||
| 4114 | if (pinfo == null) | 4116 | if (pinfo == null) |
| 4115 | return UUID.Zero.ToString(); | 4117 | return UUID.Zero.ToString(); |