diff options
author | Alexei Arabadji <aarabadji@productengine.com> | 2010-04-29 16:09:00 +0300 |
---|---|---|
committer | Alexei Arabadji <aarabadji@productengine.com> | 2010-04-29 16:09:00 +0300 |
commit | 85e3432579844afa8f76b4071329264f85711507 (patch) | |
tree | b27e91ddd6af1890a294361ed508ff6bf311de6a /indra/newview/llinventorybridge.cpp | |
parent | 8dae4c265e75e93ce3691ea1143e314f2fa84d93 (diff) |
fixed EXT-6736 Notecard floater missing Keep/Discard Buttons (vwr 2.0)
Added missing 'Delete' button to the Notecard Preview dialog;
reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/330/
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
-rw-r--r-- | indra/newview/llinventorybridge.cpp | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index c6f806178c..2d08c0a01a 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -853,21 +853,7 @@ void LLInvFVBridge::changeItemParent(LLInventoryModel* model, const LLUUID& new_parent_id, BOOL restamp) { - if (item->getParentUUID() != new_parent_id) - { - LLInventoryModel::update_list_t update; - LLInventoryModel::LLCategoryUpdate old_folder(item->getParentUUID(),-1); - update.push_back(old_folder); - LLInventoryModel::LLCategoryUpdate new_folder(new_parent_id, 1); - update.push_back(new_folder); - gInventory.accountForUpdate(update); - - LLPointer<LLViewerInventoryItem> new_item = new LLViewerInventoryItem(item); - new_item->setParent(new_parent_id); - new_item->updateParentOnServer(restamp); - model->updateItem(new_item); - model->notifyObservers(); - } + change_item_parent(model, item, new_parent_id, restamp); } // static |