diff options
| author | Kitty Barnett <develop@catznip.com> | 2011-01-17 10:09:52 -0500 |
|---|---|---|
| committer | Kitty Barnett <develop@catznip.com> | 2011-01-17 10:09:52 -0500 |
| commit | 1d7b46e2c32c6bdf2e6cf5a8b9dcb0c8cb767b1b (patch) | |
| tree | 4a5abfd925007cdf78b913cc9f59ccfdaa505869 | |
| parent | 7314ad41be6142463123e8523c8b97b38400dd9b (diff) | |
VWR-24217: allow Contents folder from object to be dragged to inventory
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/llpanelobjectinventory.cpp | 20 |
2 files changed, 6 insertions, 15 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index f21354b406..839e92e086 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -393,6 +393,7 @@ Kitty Barnett STORM-288 STORM-799 STORM-800 + VWR-24217 Kunnis Basiat VWR-82 VWR-102 diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp index 211b9cf4b1..0b6267c9e6 100644 --- a/indra/newview/llpanelobjectinventory.cpp +++ b/indra/newview/llpanelobjectinventory.cpp @@ -766,22 +766,12 @@ BOOL LLTaskCategoryBridge::startDrag(EDragAndDropType* type, LLUUID* id) const LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID()); if(object) { - const LLInventoryItem *inv = dynamic_cast<LLInventoryItem*>(object->getInventoryObject(mUUID)); - if (inv) + const LLInventoryObject* cat = object->getInventoryObject(mUUID); + if ( (cat) && (move_inv_category_world_to_agent(mUUID, LLUUID::null, FALSE)) ) { - const LLPermissions& perm = inv->getPermissions(); - bool can_copy = gAgent.allowOperation(PERM_COPY, perm, - GP_OBJECT_MANIPULATE); - if((can_copy && perm.allowTransferTo(gAgent.getID())) - || object->permYouOwner()) -// || gAgent.isGodlike()) - - { - *type = LLViewerAssetType::lookupDragAndDropType(inv->getType()); - - *id = inv->getUUID(); - return TRUE; - } + *type = LLViewerAssetType::lookupDragAndDropType(cat->getType()); + *id = mUUID; + return TRUE; } } } |