diff options
author | Vegaslon | 2014-05-05 19:56:35 -0400 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2014-05-06 17:35:34 +0100 |
commit | e245638f2421f77bb4478705ef126f849a28c9ad (patch) | |
tree | 1aeb21f7e93c73abf4499ce7ec8fb4ede5aa9d5f /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |
parent | Mantis 7146 The lsl function llGetMassMKS is not implemented (diff) | |
download | opensim-SC_OLD-e245638f2421f77bb4478705ef126f849a28c9ad.zip opensim-SC_OLD-e245638f2421f77bb4478705ef126f849a28c9ad.tar.gz opensim-SC_OLD-e245638f2421f77bb4478705ef126f849a28c9ad.tar.bz2 opensim-SC_OLD-e245638f2421f77bb4478705ef126f849a28c9ad.tar.xz |
Change llUnSit to be able to unsit any avatar that is currently sat on the object, not just avatars sitting on the sittarget in the object containing the script. or when the object is owned by the parcel, land group or estate owner.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 3 |
1 files changed, 2 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 1dcd1cc..5590cd5 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -6155,10 +6155,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
6155 | if (UUID.TryParse(id, out key)) | 6155 | if (UUID.TryParse(id, out key)) |
6156 | { | 6156 | { |
6157 | ScenePresence av = World.GetScenePresence(key); | 6157 | ScenePresence av = World.GetScenePresence(key); |
6158 | List<ScenePresence> sittingAvatars = m_host.ParentGroup.GetSittingAvatars(); | ||
6158 | 6159 | ||
6159 | if (av != null) | 6160 | if (av != null) |
6160 | { | 6161 | { |
6161 | if (llAvatarOnSitTarget() == id) | 6162 | if (sittingAvatars.Contains(av)) |
6162 | { | 6163 | { |
6163 | // if the avatar is sitting on this object, then | 6164 | // if the avatar is sitting on this object, then |
6164 | // we can unsit them. We don't want random scripts unsitting random people | 6165 | // we can unsit them. We don't want random scripts unsitting random people |