livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "SL-14632 FIXED The viewer is crashed after deleting the new favorite folder"

meow-7.2.2
Mnikolenko Productengine 2021-04-21 12:07:31 +03:00
parent bf5ae51d2e
commit b9fa5d55b5
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/llviewerinventory.cpp
View File

@ -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