4 files changed, 39 insertions, 5 deletions

diff --git a/OpenSim/Region/Environment/PermissionManager.cs b/OpenSim/Region/Environment/PermissionManager.cs
index 2698d3f..1daf5c3 100644
--- a/OpenSim/Region/Environment/PermissionManager.cs
+++ b/OpenSim/Region/Environment/PermissionManager.cs
@@ -91,16 +91,23 @@ namespace OpenSim.Region.Environment
 

         #region Object Permissions

 

-        protected virtual bool GenericObjectPermission(LLUUID user, LLUUID obj)

+        protected virtual bool GenericObjectPermission(LLUUID user, LLUUID objId)

         {

             // Default: deny

             bool permission = false;

 

+            if( !m_scene.Entities.ContainsKey( objId ))

+            {

+                return false;

+            }

+            

             // If it's not an object, we cant edit it.

-            if (!(m_scene.Entities[obj] is SceneObjectGroup))

+            if (!(m_scene.Entities[objId] is SceneObjectGroup))

+            {

                 return false;

-

-            SceneObjectGroup task = (SceneObjectGroup)m_scene.Entities[obj];

+            }

+            

+            SceneObjectGroup task = (SceneObjectGroup)m_scene.Entities[objId];

             LLUUID taskOwner = null;  

 

             // Object owners should be able to edit their own content

diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
index afa4ea5..10bdd54 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
@@ -752,7 +752,7 @@ namespace OpenSim.Region.Environment.Scenes
             }
         }
 
-        public void ProcessObjectGrab(uint localID, LLVector3 offsetPos, IClientAPI remoteClient)
+        public virtual void ProcessObjectGrab(uint localID, LLVector3 offsetPos, IClientAPI remoteClient)
         {
             this.EventManager.TriggerObjectGrab(localID, offsetPos, remoteClient);
         }
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 3bd83aa..77d936d 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -863,5 +863,28 @@ namespace OpenSim.Region.Environment.Scenes
             m_rootPart.Text = text;
             m_rootPart.ScheduleTerseUpdate();
         }
+
+        public void ObjectGrabHandler(uint localId, LLVector3 offsetPos, IClientAPI remoteClient)
+        {
+            if( m_rootPart.LocalID == localId )
+            {
+                OnGrabGroup(offsetPos, remoteClient);
+            }
+            else
+            {
+                SceneObjectPart part = GetChildPrim(localId);
+                OnGrabPart(part, offsetPos, remoteClient);
+            }
+        }
+
+        public virtual void OnGrabPart(SceneObjectPart part, LLVector3 offsetPos, IClientAPI remoteClient)
+        {
+            part.OnGrab(offsetPos, remoteClient);
+        }
+
+        public virtual void OnGrabGroup(LLVector3 offsetPos, IClientAPI remoteClient)
+        {
+
+        }
     }
 }
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index c4752a5..8e570d4 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -566,6 +566,10 @@ namespace OpenSim.Region.Environment.Scenes
         public virtual void UpdateMovement()
         {
         }
+
+        public virtual void OnGrab(LLVector3 offsetPos, IClientAPI remoteClient)
+        {
+        }
     }
 }