diff options
author | Tom Grimshaw | 2010-05-10 05:44:24 -0700 |
---|---|---|
committer | Tom Grimshaw | 2010-05-10 05:44:24 -0700 |
commit | 2e94c757296973e07529ad6ae927d9d9251627b6 (patch) | |
tree | 5fb348ddf750087898a6fcdfe0a492c305b35d3b /OpenSim/Region/ScriptEngine/Shared | |
parent | Greatly improve login time for users with large friends lists by requesting a... (diff) | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
download | opensim-SC-2e94c757296973e07529ad6ae927d9d9251627b6.zip opensim-SC-2e94c757296973e07529ad6ae927d9d9251627b6.tar.gz opensim-SC-2e94c757296973e07529ad6ae927d9d9251627b6.tar.bz2 opensim-SC-2e94c757296973e07529ad6ae927d9d9251627b6.tar.xz |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 9 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs | 1 |
2 files changed, 7 insertions, 3 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..68f6e7b 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(); |
@@ -5822,7 +5824,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
5822 | public LSL_String llGetLandOwnerAt(LSL_Vector pos) | 5824 | public LSL_String llGetLandOwnerAt(LSL_Vector pos) |
5823 | { | 5825 | { |
5824 | m_host.AddScriptLPS(1); | 5826 | m_host.AddScriptLPS(1); |
5825 | return World.LandChannel.GetLandObject((float)pos.x, (float)pos.y).LandData.OwnerID.ToString(); | 5827 | ILandObject land = World.LandChannel.GetLandObject((float)pos.x, (float)pos.y); |
5828 | if (land == null) | ||
5829 | return UUID.Zero.ToString(); | ||
5830 | return land.LandData.OwnerID.ToString(); | ||
5826 | } | 5831 | } |
5827 | 5832 | ||
5828 | /// <summary> | 5833 | /// <summary> |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs index d354fde..a5b1124 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs | |||
@@ -485,7 +485,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins | |||
485 | } | 485 | } |
486 | else | 486 | else |
487 | { | 487 | { |
488 | // If full circle is asked for, just add it | ||
489 | sensedEntities.Add(new SensedEntity(dis, presence.UUID)); | 488 | sensedEntities.Add(new SensedEntity(dis, presence.UUID)); |
490 | } | 489 | } |
491 | } | 490 | } |