refactor: simplify methods in Scene.PacketHandlers.cs by using GetGroupByPrim() rather than retrieving GetEntities() and inspecting the entire list

OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs

@@ -116,18 +116,10 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="remoteClient"></param>
         public void RequestPrim(uint primLocalID, IClientAPI remoteClient)
         {
-            EntityBase[] entityList = GetEntities();
+            SceneObjectGroup sog = GetGroupByPrim(primLocalID);
-            foreach (EntityBase ent in entityList)
+
-            {
+            if (sog != null)
-                if (ent is SceneObjectGroup)
+                sog.SendFullUpdateToClient(remoteClient);
-                {
-                    if (((SceneObjectGroup)ent).LocalId == primLocalID)
-                    {
-                        ((SceneObjectGroup)ent).SendFullUpdateToClient(remoteClient);
-                        return;
-                    }
-                }
-            }
         }
 
         /// <summary>
@@ -137,46 +129,27 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="remoteClient"></param>
         public void SelectPrim(uint primLocalID, IClientAPI remoteClient)
         {
-            EntityBase[] entityList = GetEntities();
+            SceneObjectPart part = GetSceneObjectPart(primLocalID);
-            foreach (EntityBase ent in entityList)
+
+            if (null == part)
+                return;
+
+            if (part.IsRoot)
             {
-                if (ent is SceneObjectGroup)
+                SceneObjectGroup sog = part.ParentGroup;
-                {
+                sog.SendPropertiesToClient(remoteClient);
-                    if (((SceneObjectGroup) ent).LocalId == primLocalID)
+                sog.IsSelected = true;
-                    {
+
-                        ((SceneObjectGroup) ent).SendPropertiesToClient(remoteClient);
-                        ((SceneObjectGroup) ent).IsSelected = true;
                 // A prim is only tainted if it's allowed to be edited by the person clicking it.
-                        if (Permissions.CanEditObject(((SceneObjectGroup)ent).UUID, remoteClient.AgentId) 
+                if (Permissions.CanEditObject(sog.UUID, remoteClient.AgentId)
-                            || Permissions.CanMoveObject(((SceneObjectGroup)ent).UUID, remoteClient.AgentId))
+                    || Permissions.CanMoveObject(sog.UUID, remoteClient.AgentId))
                 {
                     EventManager.TriggerParcelPrimCountTainted();
                 }
-                        break;
             }
             else
-                    {
-                        // We also need to check the children of this prim as they
-                        // can be selected as well and send property information
-                        bool foundPrim = false;
-                        
-                        SceneObjectGroup sog = ent as SceneObjectGroup;
-
-                        SceneObjectPart[] partList = sog.Parts;
-                        foreach (SceneObjectPart part in partList)
-                        {
-                            if (part.LocalId == primLocalID) 
             {
                  part.SendPropertiesToClient(remoteClient);
-                                foundPrim = true;
-                                break;
-                            }
-                        }
-                            
-                        if (foundPrim) 
-                            break;
-                   }
-                }
             }
         }
 
@@ -250,32 +223,26 @@ namespace OpenSim.Region.Framework.Scenes
 
         public virtual void ProcessObjectGrab(uint localID, Vector3 offsetPos, IClientAPI remoteClient, List<SurfaceTouchEventArgs> surfaceArgs)
         {
-            EntityBase[] EntityList = GetEntities();
+            SceneObjectPart part = GetSceneObjectPart(localID);
+            
+            if (part == null)
+                return;
+
+            SceneObjectGroup obj = part.ParentGroup;
 
             SurfaceTouchEventArgs surfaceArg = null;
             if (surfaceArgs != null && surfaceArgs.Count > 0)
                 surfaceArg = surfaceArgs[0];
 
-            foreach (EntityBase ent in EntityList)
-            {
-                if (ent is SceneObjectGroup)
-                {
-                    SceneObjectGroup obj = ent as SceneObjectGroup;
-                    if (obj != null)
-                    {
-                        // Is this prim part of the group
-                        if (obj.HasChildPrim(localID))
-                        {
             // Currently only grab/touch for the single prim
             // the client handles rez correctly
             obj.ObjectGrabHandler(localID, offsetPos, remoteClient);
     
-                            SceneObjectPart part = obj.GetChildPart(localID);
-
             // If the touched prim handles touches, deliver it
             // If not, deliver to root prim
             if ((part.ScriptEvents & scriptEvents.touch_start) != 0)
                 EventManager.TriggerObjectGrab(part.LocalId, 0, part.OffsetPosition, remoteClient, surfaceArg);
+
             // Deliver to the root prim if the touched prim doesn't handle touches
             // or if we're meant to pass on touches anyway. Don't send to root prim
             // if prim touched is the root prim as we just did it
@@ -284,34 +251,21 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 EventManager.TriggerObjectGrab(obj.RootPart.LocalId, part.LocalId, part.OffsetPosition, remoteClient, surfaceArg);
             }
-
-                            return;
-                        }
-                    }
-                }
-            }
         }
 
-        public virtual void ProcessObjectGrabUpdate(UUID objectID, Vector3 offset, Vector3 pos, IClientAPI remoteClient, List<SurfaceTouchEventArgs> surfaceArgs)
+        public virtual void ProcessObjectGrabUpdate(
+            UUID objectID, Vector3 offset, Vector3 pos, IClientAPI remoteClient, List<SurfaceTouchEventArgs> surfaceArgs)
         {
-            EntityBase[] EntityList = GetEntities();
+            SceneObjectPart part = GetSceneObjectPart(objectID);
+            if (part == null)
+                return;
+
+            SceneObjectGroup obj = part.ParentGroup;
 
             SurfaceTouchEventArgs surfaceArg = null;
             if (surfaceArgs != null && surfaceArgs.Count > 0)
                 surfaceArg = surfaceArgs[0];
 
-            foreach (EntityBase ent in EntityList)
-            {
-                if (ent is SceneObjectGroup)
-                {
-                    SceneObjectGroup obj = ent as SceneObjectGroup;
-                    if (obj != null)
-                    {
-                        // Is this prim part of the group
-                        if (obj.HasChildPrim(objectID))
-                        {
-                            SceneObjectPart part = obj.GetChildPart(objectID);
-
             // If the touched prim handles touches, deliver it
             // If not, deliver to root prim
             if ((part.ScriptEvents & scriptEvents.touch) != 0)
@@ -324,47 +278,26 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 EventManager.TriggerObjectGrabbing(obj.RootPart.LocalId, part.LocalId, part.OffsetPosition, remoteClient, surfaceArg);
             }
-
-                            return;
-                        }
-                    }
-                }
-            }
         }
 
         public virtual void ProcessObjectDeGrab(uint localID, IClientAPI remoteClient, List<SurfaceTouchEventArgs> surfaceArgs)
         {
-            EntityBase[] EntityList = GetEntities();
+            SceneObjectPart part = GetSceneObjectPart(localID);
+            if (part == null)
+                return;
+
+            SceneObjectGroup obj = part.ParentGroup;
 
             SurfaceTouchEventArgs surfaceArg = null;
             if (surfaceArgs != null && surfaceArgs.Count > 0)
                 surfaceArg = surfaceArgs[0];
 
-            foreach (EntityBase ent in EntityList)
-            {
-                if (ent is SceneObjectGroup)
-                {
-                    SceneObjectGroup obj = ent as SceneObjectGroup;
-
-                    // Is this prim part of the group
-                    if (obj.HasChildPrim(localID))
-                    {
-                        SceneObjectPart part=obj.GetChildPart(localID);
-                        if (part != null)
-                        {
             // If the touched prim handles touches, deliver it
             // If not, deliver to root prim
             if ((part.ScriptEvents & scriptEvents.touch_end) != 0)
                 EventManager.TriggerObjectDeGrab(part.LocalId, 0, remoteClient, surfaceArg);
             else
                 EventManager.TriggerObjectDeGrab(obj.RootPart.LocalId, part.LocalId, remoteClient, surfaceArg);
-
-                            return;
-                        }
-                        return;
-                    }
-                }
-            }
         }
 
         public void ProcessAvatarPickerRequest(IClientAPI client, UUID avatarID, UUID RequestID, string query)

OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs

@@ -1373,8 +1373,13 @@ namespace OpenSim.Region.Framework.Scenes
 
         #endregion
 
-        // Send the parts of this SOG to a single client
+        /// <summary>
-        // Used when the client initially connects and when client sends RequestPrim packet
+        /// Send the parts of this SOG to a single client
+        /// </summary>
+        /// <remarks>
+        /// Used when the client initially connects and when client sends RequestPrim packet
+        /// </remarks>
+        /// <param name="remoteClient"></param>
         public void SendFullUpdateToClient(IClientAPI remoteClient)
         {
             RootPart.SendFullUpdate(remoteClient);
@@ -1678,10 +1683,11 @@ namespace OpenSim.Region.Framework.Scenes
 
         /// <summary>
         /// Reset the UUIDs for all the prims that make up this group.
-        ///
+        /// </summary>
+        /// <remarks>
         /// This is called by methods which want to add a new group to an existing scene, in order
         /// to ensure that there are no clashes with groups already present.
-        /// </summary>
+        /// </remarks>
         public void ResetIDs()
         {
             lock (m_parts.SyncRoot)