* Rewired Touch to route to group/part (Still triggering EventManager as well)

2 files changed, 16 insertions, 0 deletions

diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
index 5a7dda5..efd682f 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
@@ -516,6 +516,20 @@ namespace OpenSim.Region.Environment.Scenes
         public virtual void ProcessObjectGrab(uint localID, LLVector3 offsetPos, IClientAPI remoteClient)
         {
             EventManager.TriggerObjectGrab(localID, offsetPos, remoteClient);
+
+            foreach (EntityBase ent in Entities.Values)
+            {
+                if (ent is SceneObjectGroup)
+                {
+                    SceneObjectGroup obj = ent as SceneObjectGroup;
+                    
+                    if( obj.HasChildPrim( localID ) )
+                    {
+                        obj.ObjectGrabHandler(localID, offsetPos, remoteClient);
+                        return;
+                    }                    
+                }
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Scenes/SceneEvents.cs b/OpenSim/Region/Environment/Scenes/SceneEvents.cs
index a5d8667..8e8e9a7 100644
--- a/OpenSim/Region/Environment/Scenes/SceneEvents.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneEvents.cs
@@ -133,7 +133,9 @@ namespace OpenSim.Region.Environment.Scenes
         public void TriggerObjectGrab(uint localID, LLVector3 offsetPos, IClientAPI remoteClient)
         {
             if (OnObjectGrab != null)
+            {
                 OnObjectGrab(localID, offsetPos, remoteClient);
+            }
         }
 
         public void TriggerRezScript(uint localID, LLUUID itemID, string script)