diff options
author | UbitUmarov | 2015-09-21 21:38:50 +0100 |
---|---|---|
committer | UbitUmarov | 2015-09-21 21:38:50 +0100 |
commit | a6b8cc9887687792868808e87ae0154f3e433522 (patch) | |
tree | 90aef3614184886799eb2d238084703b4635c622 /OpenSim/Region | |
parent | try to remove Scenepresence dependence on sog m_linkedAvatars, sitting may st... (diff) | |
download | opensim-SC-a6b8cc9887687792868808e87ae0154f3e433522.zip opensim-SC-a6b8cc9887687792868808e87ae0154f3e433522.tar.gz opensim-SC-a6b8cc9887687792868808e87ae0154f3e433522.tar.bz2 opensim-SC-a6b8cc9887687792868808e87ae0154f3e433522.tar.xz |
replace LSL reference to sog GetLinkedAvatars
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 8 |
1 files changed, 5 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 337e862..de4fce3 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -538,9 +538,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
538 | List<ScenePresence> ret = new List<ScenePresence>(); | 538 | List<ScenePresence> ret = new List<ScenePresence>(); |
539 | if (m_host == null || m_host.ParentGroup == null || m_host.ParentGroup.IsDeleted) | 539 | if (m_host == null || m_host.ParentGroup == null || m_host.ParentGroup.IsDeleted) |
540 | return ret; | 540 | return ret; |
541 | |||
542 | List<ScenePresence> avs = m_host.ParentGroup.GetLinkedAvatars(); | ||
543 | 541 | ||
542 | // List<ScenePresence> avs = m_host.ParentGroup.GetLinkedAvatars(); | ||
543 | // this needs check | ||
544 | List<ScenePresence> avs = m_host.ParentGroup.GetSittingAvatars(); | ||
544 | switch (linkType) | 545 | switch (linkType) |
545 | { | 546 | { |
546 | case ScriptBaseClass.LINK_SET: | 547 | case ScriptBaseClass.LINK_SET: |
@@ -2801,7 +2802,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2801 | } | 2802 | } |
2802 | else // fix sitting avatars. This is only needed bc of how we link avas to child parts, not root part | 2803 | else // fix sitting avatars. This is only needed bc of how we link avas to child parts, not root part |
2803 | { | 2804 | { |
2804 | List<ScenePresence> sittingavas = part.ParentGroup.GetLinkedAvatars(); | 2805 | // List<ScenePresence> sittingavas = part.ParentGroup.GetLinkedAvatars(); |
2806 | List<ScenePresence> sittingavas = part.ParentGroup.GetSittingAvatars(); | ||
2805 | if (sittingavas.Count > 0) | 2807 | if (sittingavas.Count > 0) |
2806 | { | 2808 | { |
2807 | foreach (ScenePresence av in sittingavas) | 2809 | foreach (ScenePresence av in sittingavas) |