diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-04-30 16:01:36 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-04-30 16:01:36 -0700 |
| commit | 7eaae1fe819aef7dc8ac20387e62c3d13ab6d72f (patch) | |
| tree | 64448ec622eb8b4d4c40c1b43821bd8a9c5c4a08 /indra/newview/llinventorybridge.cpp | |
| parent | 07c207346f63d464e45efe0be3aae64138982279 (diff) | |
| parent | 10b073413548db34ec4c6c6f6976414cd97f9954 (diff) | |
Merge
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 |