diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2021-04-21 12:07:31 +0300 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2021-04-21 12:07:31 +0300 |
| commit | b9fa5d55b50739238ff4cfa8ce0f581b519de13f (patch) | |
| tree | 71bd13816198ac2f8740cd233f29ffc8b502779e /indra | |
| parent | bf5ae51d2e4d0e998fd2dae023d893b8213e8549 (diff) | |
Revert "SL-14632 FIXED The viewer is crashed after deleting the new favorite folder"
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llviewerinventory.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp index 2b200c17c1..bbed741a33 100644 --- a/indra/newview/llviewerinventory.cpp +++ b/indra/newview/llviewerinventory.cpp @@ -1422,11 +1422,6 @@ void remove_inventory_category( LLNotificationsUtil::add("CannotRemoveProtectedCategories"); return; } - const LLUUID fav_id = gInventory.findUserDefinedCategoryUUIDForType(LLFolderType::FT_FAVORITE); - if ((cat_id == fav_id) || gInventory.isObjectDescendentOf(fav_id, cat_id)) - { - gSavedPerAccountSettings.setString("FavoritesFolder", ""); - } AISAPI::completion_t cr = boost::bind(&doInventoryCb, cb, _1); AISAPI::RemoveCategory(cat_id, cr); } @@ -1466,12 +1461,6 @@ void purge_descendents_of(const LLUUID& id, LLPointer<LLInventoryCallback> cb) LLPointer<LLViewerInventoryCategory> cat = gInventory.getCategory(id); if (cat.notNull()) { - const LLUUID fav_id = gInventory.findUserDefinedCategoryUUIDForType(LLFolderType::FT_FAVORITE); - if ((id == fav_id) || gInventory.isObjectDescendentOf(fav_id, id)) - { - gSavedPerAccountSettings.setString("FavoritesFolder", ""); - } - if (LLClipboard::instance().hasContents()) { // Remove items from clipboard or it will remain active even if there is nothing to paste/copy |