From da83ee28be93ff2649e1df214d942b01104247de Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 19 Apr 2010 21:02:36 +0100
Subject: If a transfer request is received for a task inventory item asset,
 then route the permissions request through the existing CanEditScript() and
 CanEditNotecard() methods. This implements the 'share with group' flag for
 notecards and scripts in prim inventory since the PermissionsModule checks
 group membership and permissions. Other than that, the code in
 PermissionsModule duplicates the checks in LLClientView so there should be no
 change other than allowing group members to edit embedded notecards and
 scripts. For all other asset types, the permission checking code in
 LLClientView continues to be used, pending refactoring of suitable
 permissions code This means that 'share with group' will not yet work for
 prim inventory items other than notecards and scripts

---
 .../CoreModules/World/Permissions/PermissionsModule.cs  | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'OpenSim/Region/CoreModules')

diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index d940564..01359f0 100644
--- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
@@ -1079,7 +1079,9 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             
                     if ((part.GroupMask & (uint)PermissionMask.Modify) == 0)
                         return false;
-                } else {
+                } 
+                else
+                {
                     if ((part.OwnerMask & (uint)PermissionMask.Modify) == 0)
                     return false;
                 }
@@ -1095,7 +1097,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
                         return false;
 
                     if (!IsGroupMember(ti.GroupID, user, 0))
-                    return false;
+                        return false;
                 }
 
                 // Require full perms
@@ -1593,14 +1595,16 @@ namespace OpenSim.Region.CoreModules.World.Permissions
                 if (part.OwnerID != user)
                 {
                     if (part.GroupID == UUID.Zero)
-                    return false;
+                        return false;
 
                     if (!IsGroupMember(part.GroupID, user, 0))
                         return false;
             
                     if ((part.GroupMask & (uint)PermissionMask.Modify) == 0)
                         return false;
-                } else {
+                } 
+                else 
+                {
                     if ((part.OwnerMask & (uint)PermissionMask.Modify) == 0)
                         return false;
                 }
@@ -1855,7 +1859,8 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             return GenericObjectPermission(agentID, prim, false);
         }
 
-        private bool CanCompileScript(UUID ownerUUID, int scriptType, Scene scene) {
+        private bool CanCompileScript(UUID ownerUUID, int scriptType, Scene scene) 
+        {
              //m_log.DebugFormat("check if {0} is allowed to compile {1}", ownerUUID, scriptType);
             switch (scriptType) {
                 case 0:
@@ -1889,4 +1894,4 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             return(false);
         }
     }
-}
+}
\ No newline at end of file
-- 
cgit v1.1