diff options
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Tests/Common/Mock/TestClient.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneGraph.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneGraph.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index ccc3f32..9fdbc54 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
@@ -941,7 +941,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
941 | 941 | ||
942 | if (sog != null) | 942 | if (sog != null) |
943 | { | 943 | { |
944 | if (sog.HasChildPrim(localID)) | 944 | if (sog.ContainsPart(localID)) |
945 | { | 945 | { |
946 | // m_log.DebugFormat( | 946 | // m_log.DebugFormat( |
947 | // "[SCENE GRAPH]: Found scene object {0} {1} {2} containing part with local id {3} in {4}. Returning.", | 947 | // "[SCENE GRAPH]: Found scene object {0} {1} {2} containing part with local id {3} in {4}. Returning.", |
@@ -969,7 +969,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
969 | if (ent is SceneObjectGroup) | 969 | if (ent is SceneObjectGroup) |
970 | { | 970 | { |
971 | sog = (SceneObjectGroup)ent; | 971 | sog = (SceneObjectGroup)ent; |
972 | if (sog.HasChildPrim(localID)) | 972 | if (sog.ContainsPart(localID)) |
973 | { | 973 | { |
974 | lock (SceneObjectGroupsByLocalPartID) | 974 | lock (SceneObjectGroupsByLocalPartID) |
975 | SceneObjectGroupsByLocalPartID[localID] = sog; | 975 | SceneObjectGroupsByLocalPartID[localID] = sog; |
@@ -1007,7 +1007,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1007 | if (ent is SceneObjectGroup) | 1007 | if (ent is SceneObjectGroup) |
1008 | { | 1008 | { |
1009 | sog = (SceneObjectGroup)ent; | 1009 | sog = (SceneObjectGroup)ent; |
1010 | if (sog.HasChildPrim(fullID)) | 1010 | if (sog.ContainsPart(fullID)) |
1011 | { | 1011 | { |
1012 | lock (SceneObjectGroupsByFullPartID) | 1012 | lock (SceneObjectGroupsByFullPartID) |
1013 | SceneObjectGroupsByFullPartID[fullID] = sog; | 1013 | SceneObjectGroupsByFullPartID[fullID] = sog; |
@@ -1096,7 +1096,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1096 | SceneObjectGroup group = GetGroupByPrim(localID); | 1096 | SceneObjectGroup group = GetGroupByPrim(localID); |
1097 | if (group == null) | 1097 | if (group == null) |
1098 | return null; | 1098 | return null; |
1099 | return group.GetChildPart(localID); | 1099 | return group.GetPart(localID); |
1100 | } | 1100 | } |
1101 | 1101 | ||
1102 | /// <summary> | 1102 | /// <summary> |
@@ -1143,7 +1143,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1143 | SceneObjectGroup group = GetGroupByPrim(fullID); | 1143 | SceneObjectGroup group = GetGroupByPrim(fullID); |
1144 | if (group == null) | 1144 | if (group == null) |
1145 | return null; | 1145 | return null; |
1146 | return group.GetChildPart(fullID); | 1146 | return group.GetPart(fullID); |
1147 | } | 1147 | } |
1148 | 1148 | ||
1149 | /// <summary> | 1149 | /// <summary> |