diff options
author | Jacek Antonelli | 2008-08-15 23:45:04 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:04 -0500 |
commit | 117e22047c5752352342d64e3fb7ce00a4eb8113 (patch) | |
tree | e32de2cfba0dda8705ae528fcd1fbe23ba075685 /linden/indra/newview/lltooldraganddrop.cpp | |
parent | Second Life viewer sources 1.18.0.6 (diff) | |
download | meta-impy-117e22047c5752352342d64e3fb7ce00a4eb8113.zip meta-impy-117e22047c5752352342d64e3fb7ce00a4eb8113.tar.gz meta-impy-117e22047c5752352342d64e3fb7ce00a4eb8113.tar.bz2 meta-impy-117e22047c5752352342d64e3fb7ce00a4eb8113.tar.xz |
Second Life viewer sources 1.18.1.2
Diffstat (limited to 'linden/indra/newview/lltooldraganddrop.cpp')
-rw-r--r-- | linden/indra/newview/lltooldraganddrop.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/linden/indra/newview/lltooldraganddrop.cpp b/linden/indra/newview/lltooldraganddrop.cpp index 6196927..655a8dd 100644 --- a/linden/indra/newview/lltooldraganddrop.cpp +++ b/linden/indra/newview/lltooldraganddrop.cpp | |||
@@ -1239,7 +1239,6 @@ BOOL LLToolDragAndDrop::handleDropTextureProtections(LLViewerObject* hit_obj, | |||
1239 | return FALSE; | 1239 | return FALSE; |
1240 | } | 1240 | } |
1241 | } | 1241 | } |
1242 | std::cout << "ASSET ID: " << new_item->getAssetUUID() << "\n"; | ||
1243 | hit_obj->updateInventory(new_item, TASK_INVENTORY_ASSET_KEY, true); | 1242 | hit_obj->updateInventory(new_item, TASK_INVENTORY_ASSET_KEY, true); |
1244 | } | 1243 | } |
1245 | else if(!item->getPermissions().allowOperationBy(PERM_TRANSFER, | 1244 | else if(!item->getPermissions().allowOperationBy(PERM_TRANSFER, |
@@ -1253,7 +1252,6 @@ std::cout << "ASSET ID: " << new_item->getAssetUUID() << "\n"; | |||
1253 | // *FIX: may want to make sure agent can paint hit_obj. | 1252 | // *FIX: may want to make sure agent can paint hit_obj. |
1254 | 1253 | ||
1255 | // make sure the object has the texture in it's inventory. | 1254 | // make sure the object has the texture in it's inventory. |
1256 | std::cout << "ASSET ID: " << new_item->getAssetUUID() << "\n"; | ||
1257 | hit_obj->updateInventory(new_item, TASK_INVENTORY_ASSET_KEY, true); | 1255 | hit_obj->updateInventory(new_item, TASK_INVENTORY_ASSET_KEY, true); |
1258 | } | 1256 | } |
1259 | return TRUE; | 1257 | return TRUE; |