4 files changed, 50 insertions, 32 deletions

diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
index a319119..9dcb88c 100644
--- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
@@ -301,13 +301,14 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
                   LLObject.ObjectFlags.ObjectMove |   // tells client that you can move the object (only, no mod)
                   LLObject.ObjectFlags.ObjectTransfer | // tells the client that you can /take/ the object if you don't own it
                   LLObject.ObjectFlags.ObjectYouOwner | // Tells client that you're the owner of the object
+                  LLObject.ObjectFlags.ObjectOwnerModify | // Tells client that you're the owner of the object
                   LLObject.ObjectFlags.ObjectYouOfficer // Tells client that you've got group object editing permission. Used when ObjectGroupOwned is set
                     );
 
             // Creating the three ObjectFlags options for this method to choose from.
             // Customize the OwnerMask
             uint objectOwnerMask = ApplyObjectModifyMasks(task.OwnerMask, objflags);
-            objectOwnerMask |= (uint)LLObject.ObjectFlags.ObjectYouOwner;
+            objectOwnerMask |= (uint)LLObject.ObjectFlags.ObjectYouOwner | (uint)LLObject.ObjectFlags.ObjectOwnerModify;
 
             // Customize the GroupMask
             uint objectGroupMask = ApplyObjectModifyMasks(task.GroupMask, objflags);
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 0e19d96..e92178c 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -897,53 +897,66 @@ namespace OpenSim.Region.Environment.Scenes
         /// This method does not handle scripts, <see>RezScript(IClientAPI, LLUUID, unit)</see>
         /// </summary>
         /// <param name="remoteClient"></param>
-        /// <param name="itemID"></param>
-        /// <param name="folderID"></param>
+        /// <param name="transactionID"></param>
+        /// <param name="itemInfo"></param>
         /// <param name="primLocalID"></param>
-        public void UpdateTaskInventory(IClientAPI remoteClient, LLUUID itemID, LLUUID folderID,
+        public void UpdateTaskInventory(IClientAPI remoteClient, LLUUID transactionID, TaskInventoryItem itemInfo,
                                         uint primLocalID)
         {
+            LLUUID itemID=itemInfo.ItemID;
+            LLUUID folderID=itemInfo.ParentID;
+
+            // Find the prim we're dealing with
             SceneObjectPart part = GetSceneObjectPart(primLocalID);
 
             if (part != null)
             {
-                LLUUID copyID = LLUUID.Random();
-                if (itemID != LLUUID.Zero)
+                TaskInventoryItem currentItem=part.GetInventoryItem(itemID);
+                if(currentItem == null)
                 {
-                    CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId);
-
-                    if (userInfo != null && userInfo.RootFolder != null)
+                    LLUUID copyID = LLUUID.Random();
+                    if (itemID != LLUUID.Zero)
                     {
-                        InventoryItemBase item = userInfo.RootFolder.FindItem(itemID);
+                        CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId);
 
-                        // Try library
-                        // XXX clumsy, possibly should be one call
-                        if (null == item)
+                        if (userInfo != null && userInfo.RootFolder != null)
                         {
-                            item = CommsManager.UserProfileCacheService.libraryRoot.FindItem(itemID);
-                        }
+                            InventoryItemBase item = userInfo.RootFolder.FindItem(itemID);
 
-                        if (item != null)
-                        {
-                            part.ParentGroup.AddInventoryItem(remoteClient, primLocalID, item, copyID);
-                            m_log.InfoFormat(
-                                "[PRIM INVENTORY]: Update with item {0} requested of prim {1} for {2}",
-                                item.Name, primLocalID, remoteClient.Name);
-                            part.GetProperties(remoteClient);
-                            if (!ExternalChecks.ExternalChecksBypassPermissions())
+                            // Try library
+                            // XXX clumsy, possibly should be one call
+                            if (null == item)
                             {
-                                if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0)
-                                    RemoveInventoryItem(remoteClient, itemID);
+                                item = CommsManager.UserProfileCacheService.libraryRoot.FindItem(itemID);
+                            }
+
+                            if (item != null)
+                            {
+                                part.ParentGroup.AddInventoryItem(remoteClient, primLocalID, item, copyID);
+                                m_log.InfoFormat(
+                                    "[PRIM INVENTORY]: Update with item {0} requested of prim {1} for {2}",
+                                    item.Name, primLocalID, remoteClient.Name);
+                                part.GetProperties(remoteClient);
+                                if (!ExternalChecks.ExternalChecksBypassPermissions())
+                                {
+                                    if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0)
+                                        RemoveInventoryItem(remoteClient, itemID);
+                                }
+                            }
+                            else
+                            {
+                                m_log.ErrorFormat(
+                                    "[PRIM INVENTORY]: Could not find inventory item {0} to update for {1}!",
+                                    itemID, remoteClient.Name);
                             }
-                        }
-                        else
-                        {
-                            m_log.ErrorFormat(
-                                "[PRIM INVENTORY]: Could not find inventory item {0} to update for {1}!",
-                                itemID, remoteClient.Name);
                         }
                     }
                 }
+                else // Updating existing item with new perms etc
+                {
+                    if(part.UpdateInventoryItem(itemInfo))
+                        part.GetProperties(remoteClient);
+                }
             }
             else
             {
diff --git a/OpenSim/Region/Environment/Scenes/SceneExternalChecks.cs b/OpenSim/Region/Environment/Scenes/SceneExternalChecks.cs
index 040ee70..2be5ab9 100644
--- a/OpenSim/Region/Environment/Scenes/SceneExternalChecks.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneExternalChecks.cs
@@ -69,6 +69,7 @@ namespace OpenSim.Region.Environment.Scenes
                         (uint)LLObject.ObjectFlags.ObjectMove |
                         (uint)LLObject.ObjectFlags.ObjectTransfer |
                         (uint)LLObject.ObjectFlags.ObjectYouOwner |
+                        (uint)LLObject.ObjectFlags.ObjectOwnerModify |
                         (uint)LLObject.ObjectFlags.ObjectYouOfficer;
 
                 foreach (GenerateClientFlags check in GenerateClientFlagsCheckFunctions)
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
index 51521ff..facf72d 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
@@ -286,7 +286,6 @@ namespace OpenSim.Region.Environment.Scenes
         public void AddInventoryItem(TaskInventoryItem item)
         {
             item.ParentID = UUID;
-            item.CreationDate = 1000;
             item.ParentPartID = UUID;
 
             string name=FindAvailableInventoryName(item.Name);
@@ -369,6 +368,10 @@ namespace OpenSim.Region.Environment.Scenes
             {
                 if (m_taskInventory.ContainsKey(item.ItemID))
                 {
+                    item.ParentID = UUID;
+                    item.ParentPartID = UUID;
+                    item.Flags=m_taskInventory[item.ItemID].Flags;
+
                     m_taskInventory[item.ItemID] = item;
                     m_inventorySerial++;
                     TriggerScriptChangedEvent(Changed.INVENTORY);