1 files changed, 20 insertions, 20 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 9d16beb..04b3766 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1127,7 +1127,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         public UUID GetPartsFullID(uint localID)
         {
-            SceneObjectPart part = GetChildPart(localID);
+            SceneObjectPart part = GetPart(localID);
             if (part != null)
             {
                 return part.UUID;
@@ -1143,7 +1143,7 @@ namespace OpenSim.Region.Framework.Scenes
             }
             else
             {
-                SceneObjectPart part = GetChildPart(localId);
+                SceneObjectPart part = GetPart(localId);
                 OnGrabPart(part, offsetPos, remoteClient);
             }
         }
@@ -1904,8 +1904,8 @@ namespace OpenSim.Region.Framework.Scenes
         /// Get a part with a given UUID
         /// </summary>
         /// <param name="primID"></param>
-        /// <returns>null if a child part with the primID was not found</returns>
-        public SceneObjectPart GetChildPart(UUID primID)
+        /// <returns>null if a part with the primID was not found</returns>
+        public SceneObjectPart GetPart(UUID primID)
         {
             SceneObjectPart childPart;
             m_parts.TryGetValue(primID, out childPart);
@@ -1916,8 +1916,8 @@ namespace OpenSim.Region.Framework.Scenes
         /// Get a part with a given local ID
         /// </summary>
         /// <param name="localID"></param>
-        /// <returns>null if a child part with the local ID was not found</returns>
-        public SceneObjectPart GetChildPart(uint localID)
+        /// <returns>null if a part with the local ID was not found</returns>
+        public SceneObjectPart GetPart(uint localID)
         {
             SceneObjectPart[] parts = m_parts.GetArray();
             for (int i = 0; i < parts.Length; i++)
@@ -2035,7 +2035,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <returns>The object group of the newly delinked prim.  Null if part could not be found</returns>
         public SceneObjectGroup DelinkFromGroup(uint partID, bool sendEvents)
         {
-            SceneObjectPart linkPart = GetChildPart(partID);
+            SceneObjectPart linkPart = GetPart(partID);
 
             if (linkPart != null)
             {
@@ -2326,7 +2326,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="localID"></param>
         public void SetPartName(string name, uint localID)
         {
-            SceneObjectPart part = GetChildPart(localID);
+            SceneObjectPart part = GetPart(localID);
             if (part != null)
             {
                 part.Name = name;
@@ -2335,7 +2335,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         public void SetPartDescription(string des, uint localID)
         {
-            SceneObjectPart part = GetChildPart(localID);
+            SceneObjectPart part = GetPart(localID);
             if (part != null)
             {
                 part.Description = des;
@@ -2344,7 +2344,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         public void SetPartText(string text, uint localID)
         {
-            SceneObjectPart part = GetChildPart(localID);
+            SceneObjectPart part = GetPart(localID);
             if (part != null)
             {
                 part.SetText(text);
@@ -2353,7 +2353,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         public void SetPartText(string text, UUID partID)
         {
-            SceneObjectPart part = GetChildPart(partID);
+            SceneObjectPart part = GetPart(partID);
             if (part != null)
             {
                 part.SetText(text);
@@ -2362,7 +2362,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         public string GetPartName(uint localID)
         {
-            SceneObjectPart part = GetChildPart(localID);
+            SceneObjectPart part = GetPart(localID);
             if (part != null)
             {
                 return part.Name;
@@ -2372,7 +2372,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         public string GetPartDescription(uint localID)
         {
-            SceneObjectPart part = GetChildPart(localID);
+            SceneObjectPart part = GetPart(localID);
             if (part != null)
             {
                 return part.Description;
@@ -2390,7 +2390,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="SetVolumeDetect"></param>
         public void UpdatePrimFlags(uint localID, bool UsePhysics, bool SetTemporary, bool SetPhantom, bool SetVolumeDetect)
         {
-            SceneObjectPart selectionPart = GetChildPart(localID);
+            SceneObjectPart selectionPart = GetPart(localID);
 
             if (SetTemporary && Scene != null)
             {
@@ -2427,7 +2427,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         public void UpdateExtraParam(uint localID, ushort type, bool inUse, byte[] data)
         {
-            SceneObjectPart part = GetChildPart(localID);
+            SceneObjectPart part = GetPart(localID);
             if (part != null)
             {
                 part.UpdateExtraParam(type, inUse, data);
@@ -2441,7 +2441,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="textureEntry"></param>
         public void UpdateTextureEntry(uint localID, byte[] textureEntry)
         {
-            SceneObjectPart part = GetChildPart(localID);
+            SceneObjectPart part = GetPart(localID);
             if (part != null)
             {
                 part.UpdateTextureEntry(textureEntry);
@@ -2473,7 +2473,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="shapeBlock"></param>
         public void UpdateShape(ObjectShapePacket.ObjectDataBlock shapeBlock, uint localID)
         {
-            SceneObjectPart part = GetChildPart(localID);
+            SceneObjectPart part = GetPart(localID);
             if (part != null)
             {
                 part.UpdateShape(shapeBlock);
@@ -2685,7 +2685,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="localID"></param>
         public void UpdateSinglePosition(Vector3 pos, uint localID)
         {
-            SceneObjectPart part = GetChildPart(localID);
+            SceneObjectPart part = GetPart(localID);
 
 //            SceneObjectPart[] parts = m_parts.GetArray();
 //            for (int i = 0; i < parts.Length; i++)
@@ -2824,7 +2824,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="localID"></param>
         public void UpdateSingleRotation(Quaternion rot, uint localID)
         {
-            SceneObjectPart part = GetChildPart(localID);
+            SceneObjectPart part = GetPart(localID);
 
             SceneObjectPart[] parts = m_parts.GetArray();
             for (int i = 0; i < parts.Length; i++)
@@ -2853,7 +2853,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="localID"></param>
         public void UpdateSingleRotation(Quaternion rot, Vector3 pos, uint localID)
         {
-            SceneObjectPart part = GetChildPart(localID);
+            SceneObjectPart part = GetPart(localID);
             if (part != null)
             {
 //                m_log.DebugFormat(