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/Framework/Scenes/SceneGraph.cs | |
parent | Allow llRegionSayTo() to work on the PUBLIC_CHANNEL, as per http://wiki.secon... (diff) | |
download | opensim-SC-f0406f9fe2f7a1d4d135934280735a3fdc41935f.zip opensim-SC-f0406f9fe2f7a1d4d135934280735a3fdc41935f.tar.gz opensim-SC-f0406f9fe2f7a1d4d135934280735a3fdc41935f.tar.bz2 opensim-SC-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 'OpenSim/Region/Framework/Scenes/SceneGraph.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneGraph.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index 5c542d6..cd1366c 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
@@ -860,7 +860,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
860 | 860 | ||
861 | if (sog != null) | 861 | if (sog != null) |
862 | { | 862 | { |
863 | if (sog.HasChildPrim(localID)) | 863 | if (sog.ContainsPart(localID)) |
864 | { | 864 | { |
865 | // m_log.DebugFormat( | 865 | // m_log.DebugFormat( |
866 | // "[SCENE GRAPH]: Found scene object {0} {1} {2} containing part with local id {3} in {4}. Returning.", | 866 | // "[SCENE GRAPH]: Found scene object {0} {1} {2} containing part with local id {3} in {4}. Returning.", |
@@ -888,7 +888,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
888 | if (ent is SceneObjectGroup) | 888 | if (ent is SceneObjectGroup) |
889 | { | 889 | { |
890 | sog = (SceneObjectGroup)ent; | 890 | sog = (SceneObjectGroup)ent; |
891 | if (sog.HasChildPrim(localID)) | 891 | if (sog.ContainsPart(localID)) |
892 | { | 892 | { |
893 | lock (SceneObjectGroupsByLocalPartID) | 893 | lock (SceneObjectGroupsByLocalPartID) |
894 | SceneObjectGroupsByLocalPartID[localID] = sog; | 894 | SceneObjectGroupsByLocalPartID[localID] = sog; |
@@ -926,7 +926,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
926 | if (ent is SceneObjectGroup) | 926 | if (ent is SceneObjectGroup) |
927 | { | 927 | { |
928 | sog = (SceneObjectGroup)ent; | 928 | sog = (SceneObjectGroup)ent; |
929 | if (sog.HasChildPrim(fullID)) | 929 | if (sog.ContainsPart(fullID)) |
930 | { | 930 | { |
931 | lock (SceneObjectGroupsByFullPartID) | 931 | lock (SceneObjectGroupsByFullPartID) |
932 | SceneObjectGroupsByFullPartID[fullID] = sog; | 932 | SceneObjectGroupsByFullPartID[fullID] = sog; |