2 files changed, 75 insertions, 50 deletions

diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 54c312c..c4e8e09 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -7093,7 +7093,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 UUID requestID = new UUID(transfer.TransferInfo.Params, 80);
 
 //                m_log.DebugFormat(
-//                    "[LLCLIENTVIEW]: Got request for asset {0} from item {1} in prim {2} by {3}", 
+//                    "[CLIENT]: Got request for asset {0} from item {1} in prim {2} by {3}", 
 //                    requestID, itemID, taskID, Name);
                 
                 if (!(((Scene)m_scene).Permissions.BypassPermissions()))
@@ -7105,60 +7105,75 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         if (part == null)
                         {
                             m_log.WarnFormat(
-                                "[LLCLIENTVIEW]: {0} requested asset {1} from item {2} in prim {3} but prim does not exist", 
+                                "[CLIENT]: {0} requested asset {1} from item {2} in prim {3} but prim does not exist", 
                                 Name, requestID, itemID, taskID);
                             return true;
                         }
 
-                        if (part.OwnerID != AgentId)
+                        TaskInventoryItem tii = part.Inventory.GetInventoryItem(itemID);
+                        if (tii == null)
                         {
                             m_log.WarnFormat(
-                                "[LLCLIENTVIEW]: {0} requested asset {1} from item {2} in prim {3} but the prim is owned by {4}",
-                                Name, requestID, itemID, taskID, part.OwnerID);                            
-                            return true;
-                        }
-
-                        if ((part.OwnerMask & (uint)PermissionMask.Modify) == 0)
-                        {
-                            m_log.WarnFormat(
-                                "[LLCLIENTVIEW]: {0} requested asset {1} from item {2} in prim {3} but modify permissions are not set", 
-                                Name, requestID, itemID, taskID);                            
-                            return true;
-                        }
-
-                        TaskInventoryItem ti = part.Inventory.GetInventoryItem(itemID);
-                        if (ti == null)
-                        {
-                            m_log.WarnFormat(
-                                "[LLCLIENTVIEW]: {0} requested asset {1} from item {2} in prim {3} but item does not exist", 
+                                "[CLIENT]: {0} requested asset {1} from item {2} in prim {3} but item does not exist", 
                                 Name, requestID, itemID, taskID);                            
                             return true;
-                        }
-
-                        if (ti.OwnerID != AgentId)
+                        }                        
+                        
+                        if (tii.Type == (int)AssetType.LSLText)
                         {
-                            m_log.WarnFormat(
-                                "[LLCLIENTVIEW]: {0} requested asset {1} from item {2} in prim {3} but the item is owned by {4}", 
-                                Name, requestID, itemID, taskID, ti.OwnerID);                            
-                            return true;
+                            if (!((Scene)m_scene).Permissions.CanEditScript(itemID, taskID, AgentId))
+                                return true;
                         }
-
-                        if ((
-                            ti.CurrentPermissions & ((uint)PermissionMask.Modify | (uint)PermissionMask.Copy | (uint)PermissionMask.Transfer)) 
-                                != ((uint)PermissionMask.Modify | (uint)PermissionMask.Copy | (uint)PermissionMask.Transfer))
+                        else if (tii.Type == (int)AssetType.Notecard)
                         {
-                            m_log.WarnFormat(
-                                "[LLCLIENTVIEW]: {0} requested asset {1} from item {2} in prim {3} but item permissions are not modify/copy/transfer", 
-                                Name, requestID, itemID, taskID);                            
-                            return true;
+                            if (!((Scene)m_scene).Permissions.CanEditNotecard(itemID, taskID, AgentId))
+                                return true;
                         }
-
-                        if (ti.AssetID != requestID)
+                        else
                         {
-                            m_log.WarnFormat(
-                                "[LLCLIENTVIEW]: {0} requested asset {1} from item {2} in prim {3} but this does not match item's asset {4}", 
-                                Name, requestID, itemID, taskID, ti.AssetID);                            
-                            return true;
+                            // TODO: Change this code to allow items other than notecards and scripts to be successfully
+                            // shared with group.  In fact, all this permissions checking should move to an IPermissionsModule
+                            if (part.OwnerID != AgentId)
+                            {
+                                m_log.WarnFormat(
+                                    "[CLIENT]: {0} requested asset {1} from item {2} in prim {3} but the prim is owned by {4}",
+                                    Name, requestID, itemID, taskID, part.OwnerID);                            
+                                return true;
+                            }
+    
+                            if ((part.OwnerMask & (uint)PermissionMask.Modify) == 0)
+                            {
+                                m_log.WarnFormat(
+                                    "[CLIENT]: {0} requested asset {1} from item {2} in prim {3} but modify permissions are not set", 
+                                    Name, requestID, itemID, taskID);                            
+                                return true;
+                            }
+    
+                            if (tii.OwnerID != AgentId)
+                            {
+                                m_log.WarnFormat(
+                                    "[CLIENT]: {0} requested asset {1} from item {2} in prim {3} but the item is owned by {4}", 
+                                    Name, requestID, itemID, taskID, tii.OwnerID);                            
+                                return true;
+                            }
+    
+                            if ((
+                                tii.CurrentPermissions & ((uint)PermissionMask.Modify | (uint)PermissionMask.Copy | (uint)PermissionMask.Transfer)) 
+                                    != ((uint)PermissionMask.Modify | (uint)PermissionMask.Copy | (uint)PermissionMask.Transfer))
+                            {
+                                m_log.WarnFormat(
+                                    "[CLIENT]: {0} requested asset {1} from item {2} in prim {3} but item permissions are not modify/copy/transfer", 
+                                    Name, requestID, itemID, taskID);                            
+                                return true;
+                            }
+    
+                            if (tii.AssetID != requestID)
+                            {
+                                m_log.WarnFormat(
+                                    "[CLIENT]: {0} requested asset {1} from item {2} in prim {3} but this does not match item's asset {4}", 
+                                    Name, requestID, itemID, taskID, tii.AssetID);                            
+                                return true;
+                            }
                         }
                     }
                     else // Agent
@@ -7197,7 +7212,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         }
 
                         if (assetRequestItem.AssetID != requestID)
+                        {
+                            m_log.WarnFormat(
+                                "[CLIENT]: {0} requested asset {1} from item {2} but this does not match item's asset {3}", 
+                                Name, requestID, itemID, assetRequestItem.AssetID);                            
                             return true;
+                        }
                     }
                 }
             }
@@ -11432,7 +11452,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 //    }
             }
 
-//            m_log.DebugFormat("[LLCLIENTVIEW]: {0} requesting asset {1}", Name, requestID);
+//            m_log.DebugFormat("[CLIENT]: {0} requesting asset {1}", Name, requestID);
 
             m_assetService.Get(requestID.ToString(), transferRequest, AssetReceived);
         }
@@ -11800,4 +11820,4 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             OutPacket(dialog, ThrottleOutPacketType.Task);
         }
     }
-}
+}
\ No newline at end of file
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