1 files changed, 23 insertions, 5 deletions

diff --git a/linden/indra/newview/lltooldraganddrop.cpp b/linden/indra/newview/lltooldraganddrop.cpp
index 6f53f79..fb430d7 100644
--- a/linden/indra/newview/lltooldraganddrop.cpp
+++ b/linden/indra/newview/lltooldraganddrop.cpp
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -1199,11 +1199,22 @@ BOOL LLToolDragAndDrop::handleDropTextureProtections(LLViewerObject* hit_obj,
                 return TRUE;
         }
 
+        // In case the inventory has not been updated (e.g. due to some recent operation
+        // causing a dirty inventory), stall the user while fetching the inventory.
+        if (hit_obj->isInventoryDirty())
+        {
+                hit_obj->fetchInventoryFromServer();
+                LLString::format_map_t args;
+                args["[ERROR_MESSAGE]"] = "Unable to add texture.\nPlease wait a few seconds and try again.";
+                gViewerWindow->alertXml("ErrorMessage", args);
+                return FALSE;
+        }
         if (hit_obj->getInventoryItemByAsset(item->getAssetUUID()))
         {
                 // if the asset is already in the object's inventory 
                 // then it can always be added to a side.
                 // This saves some work if the task's inventory is already loaded
+                // and ensures that the texture item is only added once.
                 return TRUE;
         }
 
@@ -1241,7 +1252,10 @@ BOOL LLToolDragAndDrop::handleDropTextureProtections(LLViewerObject* hit_obj,
                                 return FALSE;
                         }
                 }
-                hit_obj->updateInventory(new_item, TASK_INVENTORY_ASSET_KEY, true);
+                // Add the texture item to the target object's inventory.
+                hit_obj->updateInventory(new_item, TASK_INVENTORY_ITEM_KEY, true);
+                // TODO: Check to see if adding the item was successful; if not, then
+                // we should return false here.
         }
         else if(!item->getPermissions().allowOperationBy(PERM_TRANSFER,
                                                                                                          gAgent.getID()))
@@ -1253,8 +1267,12 @@ BOOL LLToolDragAndDrop::handleDropTextureProtections(LLViewerObject* hit_obj,
                 }
                 // *FIX: may want to make sure agent can paint hit_obj.
 
-                // make sure the object has the texture in it's inventory.
-                hit_obj->updateInventory(new_item, TASK_INVENTORY_ASSET_KEY, true);
+                // Add the texture item to the target object's inventory.
+                hit_obj->updateInventory(new_item, TASK_INVENTORY_ITEM_KEY, true);
+                // Force the object to update its refetch its inventory so it has this texture.
+                hit_obj->fetchInventoryFromServer();
+                // TODO: Check to see if adding the item was successful; if not, then
+                // we should return false here.
         }
         return TRUE;
 }