From 5971c647e4abd11c4c4f055f124ac2251b720c25 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Mon, 15 Feb 2021 16:49:08 +0200
Subject: SL-14632 FIXED The viewer is crashed after purging the trash with
 favorites folder

---
 indra/newview/llviewerinventory.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'indra')

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
-- 
cgit v1.2.3