diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2021-02-15 16:49:08 +0200 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2021-02-15 16:49:08 +0200 |
| commit | 5971c647e4abd11c4c4f055f124ac2251b720c25 (patch) | |
| tree | 8cb9d3371a123b8adf3f727e2beceef3644e7431 /indra/newview | |
| parent | b23feb2c623df8a58a52afb5fd4e5806a630d3d4 (diff) | |
SL-14632 FIXED The viewer is crashed after purging the trash with favorites folder
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewerinventory.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp index ed1d726528..2b200c17c1 100644 --- a/indra/newview/llviewerinventory.cpp +++ b/indra/newview/llviewerinventory.cpp @@ -1466,6 +1466,12 @@ 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 |