diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2016-07-25 11:18:20 +0300 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2016-07-25 11:18:20 +0300 |
| commit | 936681cb82d0ec70013430a131aa7cdbe163725b (patch) | |
| tree | 63a56e465282553f23a51ff40a067027d1d7328c | |
| parent | 7a58ae0f17ec495f32b7e2383f7313db6101119c (diff) | |
MAINT-6568 Detached Object Ends up in Root of Inventory
| -rwxr-xr-x | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/llinventorymodel.cpp | 9 |
2 files changed, 8 insertions, 2 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 71612af544..49c9c2cb1d 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -794,6 +794,7 @@ Kitty Barnett MAINT-6152 MAINT-6153 MAINT-6154 + MAINT-6568 Kolor Fall Komiko Okamoto Korvel Noh diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp index da06cfd311..d328973bae 100644 --- a/indra/newview/llinventorymodel.cpp +++ b/indra/newview/llinventorymodel.cpp @@ -914,8 +914,11 @@ U32 LLInventoryModel::updateItem(const LLViewerInventoryItem* item, U32 mask) item_array_t* item_array = get_ptr_in_map(mParentChildItemTree, category_id); if( item_array ) { + LLInventoryModel::LLCategoryUpdate update(category_id, 1); + gInventory.accountForUpdate(update); + // *FIX: bit of a hack to call update server from here... - new_item->updateServer(TRUE); + new_item->updateParentOnServer(FALSE); item_array->push_back(new_item); } else @@ -956,9 +959,11 @@ U32 LLInventoryModel::updateItem(const LLViewerInventoryItem* item, U32 mask) item_array = get_ptr_in_map(mParentChildItemTree, parent_id); if(item_array) { + LLInventoryModel::LLCategoryUpdate update(parent_id, 1); + gInventory.accountForUpdate(update); // *FIX: bit of a hack to call update server from // here... - new_item->updateServer(TRUE); + new_item->updateParentOnServer(FALSE); item_array->push_back(new_item); } else |