diff options
author | Justin Clark-Casey (justincc) | 2012-03-31 01:45:37 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-03-31 01:45:37 +0100 |
commit | f0406f9fe2f7a1d4d135934280735a3fdc41935f (patch) | |
tree | e6193662a8b1a8ea4cda9477f64ec5793941e3d1 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation | |
parent | Allow llRegionSayTo() to work on the PUBLIC_CHANNEL, as per http://wiki.secon... (diff) | |
download | opensim-SC_OLD-f0406f9fe2f7a1d4d135934280735a3fdc41935f.zip opensim-SC_OLD-f0406f9fe2f7a1d4d135934280735a3fdc41935f.tar.gz opensim-SC_OLD-f0406f9fe2f7a1d4d135934280735a3fdc41935f.tar.bz2 opensim-SC_OLD-f0406f9fe2f7a1d4d135934280735a3fdc41935f.tar.xz |
Rename SOG.HasChildPrim(uint) to SOG.ContainsPart(uint) to match existing ContainsPart method and remove method duplication.
HasChildPrim is also misleading since the 'root' prim can also be returned.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 6 |
1 files changed, 3 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 7455929..b502ab8 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -3763,7 +3763,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3763 | // parse for sitting avatare-uuids | 3763 | // parse for sitting avatare-uuids |
3764 | World.ForEachRootScenePresence(delegate(ScenePresence presence) | 3764 | World.ForEachRootScenePresence(delegate(ScenePresence presence) |
3765 | { | 3765 | { |
3766 | if (presence.ParentID != 0 && m_host.ParentGroup.HasChildPrim(presence.ParentID)) | 3766 | if (presence.ParentID != 0 && m_host.ParentGroup.ContainsPart(presence.ParentID)) |
3767 | keytable.Add(presence.UUID); | 3767 | keytable.Add(presence.UUID); |
3768 | }); | 3768 | }); |
3769 | 3769 | ||
@@ -3826,7 +3826,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3826 | World.ForEachRootScenePresence(delegate(ScenePresence presence) | 3826 | World.ForEachRootScenePresence(delegate(ScenePresence presence) |
3827 | { | 3827 | { |
3828 | SceneObjectPart sitPart = presence.ParentPart; | 3828 | SceneObjectPart sitPart = presence.ParentPart; |
3829 | if (sitPart != null && m_host.ParentGroup.HasChildPrim(sitPart.LocalId)) | 3829 | if (sitPart != null && m_host.ParentGroup.ContainsPart(sitPart.LocalId)) |
3830 | nametable.Add(presence.ControllingClient.Name); | 3830 | nametable.Add(presence.ControllingClient.Name); |
3831 | }); | 3831 | }); |
3832 | 3832 | ||
@@ -7684,7 +7684,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7684 | int avatarCount = 0; | 7684 | int avatarCount = 0; |
7685 | World.ForEachRootScenePresence(delegate(ScenePresence presence) | 7685 | World.ForEachRootScenePresence(delegate(ScenePresence presence) |
7686 | { | 7686 | { |
7687 | if (presence.ParentID != 0 && m_host.ParentGroup.HasChildPrim(presence.ParentID)) | 7687 | if (presence.ParentID != 0 && m_host.ParentGroup.ContainsPart(presence.ParentID)) |
7688 | avatarCount++; | 7688 | avatarCount++; |
7689 | }); | 7689 | }); |
7690 | 7690 | ||