2 files changed, 20 insertions, 7 deletions

diff --git a/OpenSim/Region/Environment/PermissionManager.cs b/OpenSim/Region/Environment/PermissionManager.cs
index 6efa116..bcaa1bf 100644
--- a/OpenSim/Region/Environment/PermissionManager.cs
+++ b/OpenSim/Region/Environment/PermissionManager.cs
@@ -103,6 +103,12 @@ namespace OpenSim.Region.Environment
 
             string reason = "Insufficient permission";
 
+            Land land = this.m_scene.LandManager.getLandObject(position.X, position.Y);
+            if ((land.landData.landFlags & ((int)Parcel.ParcelFlags.CreateObjects)) == (int)Parcel.ParcelFlags.CreateObjects)
+                permission = true;
+
+            //TODO: check for group rights
+
             if (IsAdministrator(user))
             {
                 permission = true;
@@ -361,4 +367,4 @@ namespace OpenSim.Region.Environment
 
         #endregion
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index c1acde4..0cb17c0 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -589,11 +589,14 @@ namespace OpenSim.Region.Environment.Scenes
                 group.SetPartDescription(description, primLocalID);
         }
 
-        public void UpdateExtraParam(uint primLocalID, ushort type, bool inUse, byte[] data)
+        public void UpdateExtraParam(LLUUID agentID, uint primLocalID, ushort type, bool inUse, byte[] data)
         {
             SceneObjectGroup group = GetGroupByPrim(primLocalID);
-            if (group != null)
-                group.UpdateExtraParam(primLocalID, type, inUse, data);
+            if (this.m_parentScene.PermissionsMngr.CanEditObject(agentID, group.GetPartsFullID(primLocalID)))
+            {
+                if (group != null)
+                    group.UpdateExtraParam(primLocalID, type, inUse, data);
+            }
         }
 
         /// <summary>
@@ -601,11 +604,14 @@ namespace OpenSim.Region.Environment.Scenes
         /// </summary>
         /// <param name="primLocalID"></param>
         /// <param name="shapeBlock"></param>
-        public void UpdatePrimShape(uint primLocalID, ObjectShapePacket.ObjectDataBlock shapeBlock)
+        public void UpdatePrimShape(LLUUID agentID, uint primLocalID, ObjectShapePacket.ObjectDataBlock shapeBlock)
         {
             SceneObjectGroup group = GetGroupByPrim(primLocalID);
-            if (group != null)
-                group.UpdateShape(shapeBlock, primLocalID);
+            if (this.m_parentScene.PermissionsMngr.CanEditObject(agentID, group.GetPartsFullID(primLocalID)))
+            {
+                if (group != null)
+                    group.UpdateShape(shapeBlock, primLocalID);
+            }
         }
 
         /// <summary>
@@ -753,3 +759,4 @@ namespace OpenSim.Region.Environment.Scenes
     }
 }
 
+