From cfc11c23390da458690aebe5867eab4a87ee7aaa Mon Sep 17 00:00:00 2001
From: Zi Ree <zi.ree@phoenixviewer.com>
Date: Mon, 22 Feb 2021 12:57:28 +0100
Subject: [PATCH 01/15] Remove attempt to hide empty filtered folders because
 it now hides all empty folders instead.

---
 indra/newview/llinventoryfilter.cpp | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/indra/newview/llinventoryfilter.cpp b/indra/newview/llinventoryfilter.cpp
index 5370e71588..ded58caba3 100644
--- a/indra/newview/llinventoryfilter.cpp
+++ b/indra/newview/llinventoryfilter.cpp
@@ -567,13 +567,6 @@ bool LLInventoryFilter::checkAgainstPermissions(const LLFolderViewModelItemInven
 {
 	if (!listener) return FALSE;
 
-	// <FS:Zi> Fix empty filtered folders still showing
-	if (listener->getInventoryType() == LLInventoryType::IT_CATEGORY)
-	{
-		return false;
-	}
-	// </FS:Zi>
-
 	PermissionMask perm = listener->getPermissionMask();
 	const LLInvFVBridge *bridge = dynamic_cast<const LLInvFVBridge *>(listener);
 	if (bridge && bridge->isLink())

From a40c7ab0918a1f0c7d857a7e24e182ed3f5bcb64 Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <pantera.polnocy@phoenixviewer.com>
Date: Mon, 22 Feb 2021 17:23:55 +0100
Subject: [PATCH 02/15] FIRE-30778 Russian translation update, by Romka
 Swallowtail

---
 .../skins/ansastorm/xui/ru/panel_main_inventory.xml | 13 ++++++++-----
 .../xui/ru/floater_inventory_view_finder.xml        |  3 +++
 .../default/xui/ru/menu_inventory_gear_default.xml  |  4 +++-
 indra/newview/skins/default/xui/ru/strings.xml      |  4 ++++
 .../skins/vintage/xui/ru/panel_main_inventory.xml   |  6 ++++--
 5 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/indra/newview/skins/ansastorm/xui/ru/panel_main_inventory.xml b/indra/newview/skins/ansastorm/xui/ru/panel_main_inventory.xml
index ea0a4c56e2..4add688fca 100644
--- a/indra/newview/skins/ansastorm/xui/ru/panel_main_inventory.xml
+++ b/indra/newview/skins/ansastorm/xui/ru/panel_main_inventory.xml
@@ -6,9 +6,10 @@
 	<panel.string name="ItemcountCompleted">
 		[ITEM_COUNT] Элементов [FILTER]
 	</panel.string>
-	<text name="ItemcountText">
-		Объекты:
-	</text>
+	<panel.string name="ItemcountUnknown">
+		Обнаружено [ITEM_COUNT] элементов [FILTER]
+	</panel.string>
+
 	<menu_bar name="inventory_menu_bar">
 		<menu label="Инвентарь" name="inventory_inventory_menu">
 			<menu_item_call name="inventory_open" label="Открыть" />
@@ -70,7 +71,9 @@
 			<menu_item_check name="inventory_filter_show_links" label="Показать ссылки" />
 			<menu_item_check name="inventory_filter_only_links" label="Показать только ссылки" />
 			<menu_item_check name="inventory_filter_hide_links" label="Скрыть ссылки" />
-			<menu_item_check name="inventory_show_partial_results" label="Показать частичные результаты поиска" />
+			<menu_item_check name="inventory_filter_only_modify" label="Только изменяемое"/>
+			<menu_item_check name="inventory_filter_only_copy" label="Только копируемое"/>
+			<menu_item_check name="inventory_filter_only_transfer" label="Только передаваемое"/>
 		</menu>
 	</menu_bar>
 	<filter_editor label="Фильтр" name="inventory search editor" tool_tip="Напишите одно или несколько слов для поиска. Для разделения используйте '+' "/>
@@ -108,7 +111,7 @@
 			<button name="new_inv_btn" tool_tip="Дополнительное окно инвентаря"/>
 		</panel>
 		<panel name="dummy_panel">
-			<text name="ItemcountText">
+			<text name="ItemcountText" tool_tip="[ITEMS] предметов, [CATEGORIES] папок">
 				Элементов
 			</text>
 		</panel>
diff --git a/indra/newview/skins/default/xui/ru/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/ru/floater_inventory_view_finder.xml
index bdab1bfd2e..9e9f358df8 100644
--- a/indra/newview/skins/default/xui/ru/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/ru/floater_inventory_view_finder.xml
@@ -15,6 +15,9 @@
 	<check_box label="Настройки" name="check_settings"/>
 	<button label="Все" label_selected="Все" name="All"/>
 	<button label="Нет" label_selected="Нет" name="None"/>
+	<check_box label="Изм." name="check_modify"/>
+	<check_box label="Коп." name="check_copy"/>
+	<check_box label="Пер." name="check_transfer"/>
 	<check_box label="Показывать папки" name="check_show_empty"/>
 	<check_box label="Создано мной" name="check_created_by_me"/>
 	<check_box label="Создано другими" name="check_created_by_others"/>
diff --git a/indra/newview/skins/default/xui/ru/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/ru/menu_inventory_gear_default.xml
index eea4287bb6..620a71305d 100644
--- a/indra/newview/skins/default/xui/ru/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/ru/menu_inventory_gear_default.xml
@@ -11,7 +11,6 @@
 		<menu_item_check name="inventory_search_by_creator" label="Создателю"/>
 		<menu_item_check name="inventory_search_by_description" label="Описанию"/>
 		<menu_item_check name="inventory_search_by_all" label="Всему"/>
-		<menu_item_check name="inventory_show_partial_results" label="Частичные результаты"/>
 	</context_menu>
 	<menu_item_check label="Добавление объектов по двойному нажатию" name="add_inv_toggle"/>
 	<menu_item_check label="Добавление одежды по двойному нажатию" name="add_invclothing_toggle"/>
@@ -27,5 +26,8 @@
 	<menu_item_check name="inventory_filter_show_links" label="Показать ссылки"/>
 	<menu_item_check name="inventory_filter_only_links" label="Показать только ссылки"/>
 	<menu_item_check name="inventory_filter_hide_links" label="Скрыть ссылки"/>
+	<menu_item_check name="inventory_filter_only_modify" label="Только изменяемое"/>
+	<menu_item_check name="inventory_filter_only_copy" label="Только копируемое"/>
+	<menu_item_check name="inventory_filter_only_transfer" label="Показать передаваемое"/>
 	<menu_item_call label="Очистить корзину" name="empty_trash"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/strings.xml b/indra/newview/skins/default/xui/ru/strings.xml
index 7dd8e42523..d6023c63dd 100644
--- a/indra/newview/skins/default/xui/ru/strings.xml
+++ b/indra/newview/skins/default/xui/ru/strings.xml
@@ -1890,6 +1890,10 @@ http://www.firestormviewer.org/support за помощь в решении эт
 	<string name="Snapshots" value=" Снимки,"/>
 	<string name="No Filters" value="Нет "/>
 	<string name="Since Logoff" value=" - с выхода"/>
+	<string name="Modifiable" value="Изменяемое"/>
+	<string name="Copyable" value="Копируемое"/>
+	<string name="Transferable" value="Передаваемое"/>
+	<string name="PermissionsFilter" value=" - Только [PERMISSIONS]"/>
 	<string name="InvFolder My Inventory">
 		Инвентарь
 	</string>
diff --git a/indra/newview/skins/vintage/xui/ru/panel_main_inventory.xml b/indra/newview/skins/vintage/xui/ru/panel_main_inventory.xml
index 136a4f8904..8b1e93da5d 100644
--- a/indra/newview/skins/vintage/xui/ru/panel_main_inventory.xml
+++ b/indra/newview/skins/vintage/xui/ru/panel_main_inventory.xml
@@ -67,7 +67,9 @@
 			<menu_item_check name="inventory_filter_show_links" label="Показать ссылки" />
 			<menu_item_check name="inventory_filter_only_links" label="Показать только ссылки" />
 			<menu_item_check name="inventory_filter_hide_links" label="Скрыть ссылки" />
-			<menu_item_check name="inventory_show_partial_results" label="Показать частичные результаты поиска" />
+			<menu_item_check name="inventory_filter_only_modify" label="Только изменяемые"/>
+			<menu_item_check name="inventory_filter_only_copy" label="Только копируемые"/>
+			<menu_item_check name="inventory_filter_only_transfer" label="Только передаваемые"/>
 		</menu>
 	</menu_bar>
 	<filter_editor label="Фильтр" name="inventory search editor" tool_tip="Напишите одно или несколько слов для поиска. Для разделения используйте '+' "/>
@@ -96,7 +98,7 @@
 		<recent_inventory_panel label="Недавние" name="Recent Items"/>
 		<worn_inventory_panel label="Надетые" name="Worn Items"/>
 	</tab_container>
-	<text name="ItemcountText">
+	<text name="ItemcountText" tool_tip="[ITEMS] предметов, [CATEGORIES] папок">
 		Объекты:
 	</text>
 </panel>

From b2d99d2b4a37b585c8189215a28029e3136908b3 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Wed, 24 Feb 2021 09:40:13 +0100
Subject: [PATCH 03/15] Prevent re-creating dead, but not yet disposed objects,
 most likely due to random packet order

---
 indra/newview/llviewerobjectlist.cpp | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp
index dc040019f0..5716125ec1 100644
--- a/indra/newview/llviewerobjectlist.cpp
+++ b/indra/newview/llviewerobjectlist.cpp
@@ -2287,6 +2287,13 @@ LLViewerObject *LLViewerObjectList::createObjectFromCache(const LLPCode pcode, L
 {
 	llassert_always(uuid.notNull());
 
+	// <FS:Ansariel> Prevent re-creating dead, but not yet disposed objects
+	if (mDeadObjects.find(uuid) != mDeadObjects.end())
+	{
+		return NULL;
+	}
+	// </FS:Ansariel>
+
     LL_DEBUGS("ObjectUpdate") << "creating " << uuid << " local_id " << local_id << LL_ENDL;
     dumpStack("ObjectUpdateStack");
     
@@ -2326,7 +2333,14 @@ LLViewerObject *LLViewerObjectList::createObject(const LLPCode pcode, LLViewerRe
 		return NULL;
 	}
 	// </FS:Ansariel>
-	
+
+	// <FS:Ansariel> Prevent re-creating dead, but not yet disposed objects
+	if (mDeadObjects.find(uuid) != mDeadObjects.end())
+	{
+		return NULL;
+	}
+	// </FS:Ansariel>
+
 	LLUUID fullid;
 	if (uuid == LLUUID::null)
 	{

From 326d12308f1462fff0a15544225291021e81444a Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Wed, 24 Feb 2021 09:42:05 +0100
Subject: [PATCH 04/15] What's the point of spamming this out in the log as
 warning?

---
 indra/newview/llavatarrendernotifier.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/llavatarrendernotifier.cpp b/indra/newview/llavatarrendernotifier.cpp
index f006fa1d8f..b608646abd 100644
--- a/indra/newview/llavatarrendernotifier.cpp
+++ b/indra/newview/llavatarrendernotifier.cpp
@@ -152,7 +152,7 @@ void LLAvatarRenderNotifier::displayNotification(bool show_over_limit)
 	}
 
     // log unconditionally
-    LL_WARNS("AvatarRenderInfo") << notification_name << " " << args << LL_ENDL;
+    LL_DEBUGS("AvatarRenderInfo") << notification_name << " " << args << LL_ENDL;
 
     if (   expire_delay // expiration of zero means do not show the notices
         && gAgentCamera.getLastCameraMode() != CAMERA_MODE_MOUSELOOK // don't display notices in Mouselook

From c9f913d312ec5edf623d29f8a43d63a9268dbf8d Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Wed, 24 Feb 2021 09:46:10 +0100
Subject: [PATCH 05/15] Remove more logspam we can't do anything about

---
 indra/newview/llvovolume.cpp | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 14c9a90bc4..3167f7cce5 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -5319,13 +5319,15 @@ static LLTrace::BlockTimerStatHandle FTM_REGISTER_FACE("Register Face");
 void LLVolumeGeometryManager::registerFace(LLSpatialGroup* group, LLFace* facep, U32 type)
 {
 	LL_RECORD_BLOCK_TIME(FTM_REGISTER_FACE);
-	if (   type == LLRenderPass::PASS_ALPHA 
-		&& facep->getTextureEntry()->getMaterialParams().notNull() 
-		&& !facep->getVertexBuffer()->hasDataType(LLVertexBuffer::TYPE_TANGENT)
-		&& LLViewerShaderMgr::instance()->getShaderLevel(LLViewerShaderMgr::SHADER_OBJECT) > 1)
-	{
-		LL_WARNS_ONCE("RenderMaterials") << "Oh no! No binormals for this alpha blended face!" << LL_ENDL;
-	}
+	// <FS:Ansariel> Can't do anything about it anyway - stop spamming the log
+	//if (   type == LLRenderPass::PASS_ALPHA 
+	//	&& facep->getTextureEntry()->getMaterialParams().notNull() 
+	//	&& !facep->getVertexBuffer()->hasDataType(LLVertexBuffer::TYPE_TANGENT)
+	//	&& LLViewerShaderMgr::instance()->getShaderLevel(LLViewerShaderMgr::SHADER_OBJECT) > 1)
+	//{
+	//	LL_WARNS_ONCE("RenderMaterials") << "Oh no! No binormals for this alpha blended face!" << LL_ENDL;
+	//}
+	// </FS:Ansariel>
 
 //	bool selected = facep->getViewerObject()->isSelected();
 //

From e9523213eff7471880e3159553b00f836169b41f Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Wed, 24 Feb 2021 09:49:20 +0100
Subject: [PATCH 06/15] Squelch even more log spam we can't do anything about

---
 indra/llcharacter/llmotioncontroller.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/indra/llcharacter/llmotioncontroller.cpp b/indra/llcharacter/llmotioncontroller.cpp
index 93c5dac12a..ac03b5f6ee 100644
--- a/indra/llcharacter/llmotioncontroller.cpp
+++ b/indra/llcharacter/llmotioncontroller.cpp
@@ -241,10 +241,12 @@ void LLMotionController::purgeExcessMotions()
 	}
 
 	U32 loaded_count = mLoadedMotions.size();
-	if (loaded_count > (2 * MAX_MOTION_INSTANCES) && loaded_count > mLastCountAfterPurge)
-	{
-		LL_WARNS_ONCE("Animation") << loaded_count << " Loaded Motions. Amount of motions is over limit." << LL_ENDL;
-	}
+	// <FS:Ansariel> Can't do anything about it anyway - stop spamming the log
+	//if (loaded_count > (2 * MAX_MOTION_INSTANCES) && loaded_count > mLastCountAfterPurge)
+	//{
+	//	LL_WARNS_ONCE("Animation") << loaded_count << " Loaded Motions. Amount of motions is over limit." << LL_ENDL;
+	//}
+	// </FS:Ansariel>
 	mLastCountAfterPurge = loaded_count;
 }
 

From dfef45cd210a66096d04fccefb45f914e5938c24 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Wed, 24 Feb 2021 09:51:08 +0100
Subject: [PATCH 07/15] If already logging this, make it at least useful

---
 indra/llcharacter/llcharacter.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/llcharacter/llcharacter.cpp b/indra/llcharacter/llcharacter.cpp
index 4dd66bc975..846ffa309a 100644
--- a/indra/llcharacter/llcharacter.cpp
+++ b/indra/llcharacter/llcharacter.cpp
@@ -106,7 +106,7 @@ LLJoint *LLCharacter::getJoint( const std::string &name )
 
 	if (!joint)
 	{
-		LL_WARNS() << "Failed to find joint." << LL_ENDL;
+		LL_WARNS() << "Failed to find joint: " << name << LL_ENDL;
 	}
 	return joint;
 }

From d4645814107aff3b12bc1ac3a12b324adf163938 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Wed, 24 Feb 2021 09:59:53 +0100
Subject: [PATCH 08/15] Move dead object check to prevent log spam

---
 indra/newview/llviewerobjectlist.cpp | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp
index 5716125ec1..1cd05de562 100644
--- a/indra/newview/llviewerobjectlist.cpp
+++ b/indra/newview/llviewerobjectlist.cpp
@@ -357,6 +357,13 @@ LLViewerObject* LLViewerObjectList::processObjectUpdateFromCache(LLVOCacheEntry*
 	cached_dpp->unpackU32(local_id, "LocalID");
 	cached_dpp->unpackU8(pcode, "PCode");
 
+	// <FS:Ansariel> Prevent re-creating dead, but not yet disposed objects
+	if (mDeadObjects.find(fullid) != mDeadObjects.end())
+	{
+		return NULL;
+	}
+	// </FS:Ansariel>
+
 	// <FS:Ansariel> Don't process derendered objects
 	if (mDerendered.end() != mDerendered.find(fullid))
 	{
@@ -684,6 +691,13 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys,
 			}
 #endif
 
+			// <FS:Ansariel> Prevent re-creating dead, but not yet disposed objects
+			if (mDeadObjects.find(fullid) != mDeadObjects.end())
+			{
+				continue;
+			}
+			// </FS:Ansariel>
+
 			if (FSAssetBlacklist::getInstance()->isBlacklisted(fullid, (pcode == LL_PCODE_LEGACY_AVATAR ? LLAssetType::AT_PERSON : LLAssetType::AT_OBJECT)))
 			{
 				LL_INFOS() << "Blacklisted " << (pcode == LL_PCODE_LEGACY_AVATAR ? "avatar" : "object") << " blocked." << LL_ENDL;
@@ -2287,13 +2301,6 @@ LLViewerObject *LLViewerObjectList::createObjectFromCache(const LLPCode pcode, L
 {
 	llassert_always(uuid.notNull());
 
-	// <FS:Ansariel> Prevent re-creating dead, but not yet disposed objects
-	if (mDeadObjects.find(uuid) != mDeadObjects.end())
-	{
-		return NULL;
-	}
-	// </FS:Ansariel>
-
     LL_DEBUGS("ObjectUpdate") << "creating " << uuid << " local_id " << local_id << LL_ENDL;
     dumpStack("ObjectUpdateStack");
     
@@ -2334,13 +2341,6 @@ LLViewerObject *LLViewerObjectList::createObject(const LLPCode pcode, LLViewerRe
 	}
 	// </FS:Ansariel>
 
-	// <FS:Ansariel> Prevent re-creating dead, but not yet disposed objects
-	if (mDeadObjects.find(uuid) != mDeadObjects.end())
-	{
-		return NULL;
-	}
-	// </FS:Ansariel>
-
 	LLUUID fullid;
 	if (uuid == LLUUID::null)
 	{

From ff8ca8cc74a2b255b98d886f2f2ed687efad316d Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Wed, 24 Feb 2021 10:41:18 +0100
Subject: [PATCH 09/15] Move deadlist check right before trying to create an
 object

---
 indra/newview/llviewerobjectlist.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp
index 1cd05de562..c90c67676a 100644
--- a/indra/newview/llviewerobjectlist.cpp
+++ b/indra/newview/llviewerobjectlist.cpp
@@ -357,13 +357,6 @@ LLViewerObject* LLViewerObjectList::processObjectUpdateFromCache(LLVOCacheEntry*
 	cached_dpp->unpackU32(local_id, "LocalID");
 	cached_dpp->unpackU8(pcode, "PCode");
 
-	// <FS:Ansariel> Prevent re-creating dead, but not yet disposed objects
-	if (mDeadObjects.find(fullid) != mDeadObjects.end())
-	{
-		return NULL;
-	}
-	// </FS:Ansariel>
-
 	// <FS:Ansariel> Don't process derendered objects
 	if (mDerendered.end() != mDerendered.find(fullid))
 	{
@@ -410,6 +403,13 @@ LLViewerObject* LLViewerObjectList::processObjectUpdateFromCache(LLVOCacheEntry*
 	bool justCreated = false;
 	if (!objectp)
 	{
+		// <FS:Ansariel> Prevent re-creating dead, but not yet disposed objects
+		if (mDeadObjects.find(fullid) != mDeadObjects.end())
+		{
+			return NULL;
+		}
+		// </FS:Ansariel>
+
 		objectp = createObjectFromCache(pcode, regionp, fullid, entry->getLocalID());
 
         LL_DEBUGS("ObjectUpdate") << "uuid " << fullid << " created objectp " << objectp << LL_ENDL;

From a0984cabbf478ba7e46472200a0f4c4048d1d2b9 Mon Sep 17 00:00:00 2001
From: Nicky <nicky.dasmijn@gmail.com>
Date: Thu, 25 Feb 2021 13:23:23 +0100
Subject: [PATCH 10/15] Make sure no invalidated pointer values get into
 cmdargv.

---
 indra/newview/llappviewerlinux.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/indra/newview/llappviewerlinux.cpp b/indra/newview/llappviewerlinux.cpp
index fc80404865..cba36b8356 100644
--- a/indra/newview/llappviewerlinux.cpp
+++ b/indra/newview/llappviewerlinux.cpp
@@ -434,15 +434,18 @@ void LLAppViewerLinux::initCrashReporting(bool reportFreeze)
     pid_str <<  LLApp::getPid();
     std::string logdir = gDirUtilp->getExpandedFilename(LL_PATH_DUMP, "");
     std::string appname = gDirUtilp->getExecutableFilename();
+	std::string grid{ LLGridManager::getInstance()->getGridId() };
+	std::string title{ LLAppViewer::instance()->getSecondLifeTitle() };
+	std::string pidstr{ pid_str.str() };
 	// launch the actual crash logger
 	const char * cmdargv[] =
 		{cmd.c_str(),
 		 "-user",
-		 (char*)LLGridManager::getInstance()->getGridId().c_str(),
+		 grid.c_str(),
 		 "-name",
-		 LLAppViewer::instance()->getSecondLifeTitle().c_str(),
+		 title.c_str(),
 		 "-pid", 
-		 pid_str.str().c_str(),
+		 pidstr.c_str(),
 		 "-dumpdir",
 		 logdir.c_str(),
 		 "-procname",

From c4db86c551387702616693ff10d857783d785185 Mon Sep 17 00:00:00 2001
From: Beq <BeqJanus@vcs.firestormviewer.org>
Date: Thu, 25 Feb 2021 15:37:17 +0000
Subject: [PATCH 11/15] more robust deadobject handling maybe

---
 indra/llcommon/lluuid.h              |  2 +
 indra/newview/llviewerobjectlist.cpp | 65 +++++++++++++---------------
 indra/newview/llviewerobjectlist.h   |  5 ++-
 3 files changed, 35 insertions(+), 37 deletions(-)

diff --git a/indra/llcommon/lluuid.h b/indra/llcommon/lluuid.h
index d98c3163ef..b6399ad094 100644
--- a/indra/llcommon/lluuid.h
+++ b/indra/llcommon/lluuid.h
@@ -134,6 +134,8 @@ public:
 
 typedef std::vector<LLUUID> uuid_vec_t;
 typedef std::set<LLUUID> uuid_set_t;
+// <FS:Beq> cleanupDeadObject spam avoidance
+typedef std::multiset<LLUUID> uuid_multiset_t;
 
 // Helper structure for ordering lluuids in stl containers.  eg:
 // std::map<LLUUID, LLWidget*, lluuid_less> widget_map;
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp
index c90c67676a..caf19088ec 100644
--- a/indra/newview/llviewerobjectlist.cpp
+++ b/indra/newview/llviewerobjectlist.cpp
@@ -403,12 +403,6 @@ LLViewerObject* LLViewerObjectList::processObjectUpdateFromCache(LLVOCacheEntry*
 	bool justCreated = false;
 	if (!objectp)
 	{
-		// <FS:Ansariel> Prevent re-creating dead, but not yet disposed objects
-		if (mDeadObjects.find(fullid) != mDeadObjects.end())
-		{
-			return NULL;
-		}
-		// </FS:Ansariel>
 
 		objectp = createObjectFromCache(pcode, regionp, fullid, entry->getLocalID());
 
@@ -691,13 +685,6 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys,
 			}
 #endif
 
-			// <FS:Ansariel> Prevent re-creating dead, but not yet disposed objects
-			if (mDeadObjects.find(fullid) != mDeadObjects.end())
-			{
-				continue;
-			}
-			// </FS:Ansariel>
-
 			if (FSAssetBlacklist::getInstance()->isBlacklisted(fullid, (pcode == LL_PCODE_LEGACY_AVATAR ? LLAssetType::AT_PERSON : LLAssetType::AT_OBJECT)))
 			{
 				LL_INFOS() << "Blacklisted " << (pcode == LL_PCODE_LEGACY_AVATAR ? "avatar" : "object") << " blocked." << LL_ENDL;
@@ -1429,25 +1416,20 @@ void LLViewerObjectList::cleanupReferences(LLViewerObject *objectp)
 	// bool new_dead_object = true;
 	if (mDeadObjects.find(objectp->mID) != mDeadObjects.end())
 	{
-		LL_INFOS() << "Object " << objectp->mID << " already on dead list!" << LL_ENDL;	
 	// <FS:Beq> FIRE-30694 DeadObject Spam
+	// LL_INFOS() << "Object " << objectp->mID << " already on dead list!" << LL_ENDL;	
 	// 	new_dead_object = false;
+		LL_DEBUGS() << "Object " << objectp->mID << " already on dead list!" << LL_ENDL;	
+	// </FS:Beq>
 	}
-	else
+	// <FS:Beq> detect but still delete dupes
+	// else
 	{
 	// <FS:Beq> FIRE-30694 DeadObject Spam
 	// 	mDeadObjects.insert(objectp->mID);
-	 	bool success;
-		std::tie( std::ignore, success ) = mDeadObjects.insert( objectp->mID );
-		if( success )
-		{
-			mNumDeadObjects++;
-			llassert( mNumDeadObjects == mDeadObjects.size() );
-		}
-		else
-		{
-			LL_WARNS() << "Object " << objectp->mID << " failed to insert on dead list!" << LL_ENDL;	
-		}
+		mDeadObjects.insert( objectp->mID );
+		mNumDeadObjects++;
+		llassert( mNumDeadObjects == mDeadObjects.size() );
 	// </FS:Beq>
 	}
 
@@ -1646,20 +1628,29 @@ void LLViewerObjectList::cleanDeadObjects(BOOL use_timer)
 	{
 		// Scan for all of the dead objects and put them all on the end of the list with no ref count ops
 		objectp = *iter;
-		if (objectp == NULL)
-		{ //we caught up to the dead tail
-			break;
-		}
+		// <FS:Beq> catch up check removed and a guard on the if added. this allows us to skip random nulls in the list (no idea if it can happen) 
+		// if (objectp == NULL)
+		// { //we caught up to the dead tail
+		// 	break;
+		// }
 
-		if (objectp->isDead())
+		// if objectp->isDead())
+		if (objectp && objectp->isDead())
+		// </FS:Beq>
 		{
 			// <FS:Beq> FIRE-30694 DeadObject Spam
 			// mDeadObjects.erase(objectp->mID); // <FS:Ansariel> Use timer for cleaning up dead objects
-			if(mDeadObjects.erase(objectp->mID)==0)
-			{
+            auto delete_me = mDeadObjects.find(objectp->mID);
+            if( delete_me !=mDeadObjects.end() )
+            {
+                mDeadObjects.erase( delete_me );
+            }
+            else
+            {
 				LL_WARNS() << "Attempt to delete object " << objectp->mID << " but object not in dead list" << LL_ENDL;
 				num_divergent++; // this is the number we are adrift in the count
-			}
+            }
+
 			LLPointer<LLViewerObject>::swap(*iter, *target);
 			*target = NULL;
 			++target;
@@ -1667,7 +1658,7 @@ void LLViewerObjectList::cleanDeadObjects(BOOL use_timer)
 
 			// <FS:Ansariel> Use timer for cleaning up dead objects
 			//if (num_removed == mNumDeadObjects || iter->isNull())
-			if (num_removed == mNumDeadObjects || iter->isNull() || (use_timer && timer.getElapsedTimeF64() > max_time))
+			if (num_removed == mNumDeadObjects || vobj_list_t::reverse_iterator{iter} == target || (use_timer && timer.getElapsedTimeF64() > max_time))
 			// </FS:Ansariel>
 			{
 				// We've cleaned up all of the dead objects or caught up to the dead tail
@@ -2533,7 +2524,9 @@ void LLViewerObjectList::findOrphans(LLViewerObject* objectp, U32 ip, U32 port)
 		}
 		else
 		{
-			LL_INFOS() << "Missing orphan child, removing from list" << LL_ENDL;
+			// <FS:Beq> descope uninteresting spam we can do nothing about.
+			// LL_INFOS() << "Missing orphan child, removing from list" << LL_ENDL;
+			LL_DEBUGS() << "Missing orphan child, removing from list" << LL_ENDL;
 
 			iter = mOrphanChildren.erase(iter);
 		}
diff --git a/indra/newview/llviewerobjectlist.h b/indra/newview/llviewerobjectlist.h
index 2a0a99f6bd..e295639cbb 100644
--- a/indra/newview/llviewerobjectlist.h
+++ b/indra/newview/llviewerobjectlist.h
@@ -223,7 +223,10 @@ protected:
 
 	vobj_list_t mMapObjects;
 
-    uuid_set_t   mDeadObjects;
+	// <FS:Beq> deadobject cleanup
+    // uuid_set_t   mDeadObjects;
+    uuid_multiset_t   mDeadObjects;
+	// </FS:Beq>
 
 	std::map<LLUUID, LLPointer<LLViewerObject> > mUUIDObjectMap;
 

From 2a71ab5ed0ca2ef8e1453cea544a8d44308929e8 Mon Sep 17 00:00:00 2001
From: Beq <BeqJanus@vcs.firestormviewer.org>
Date: Thu, 25 Feb 2021 17:46:02 +0000
Subject: [PATCH 12/15] Retain the null check, restrict spam frequency of error

---
 indra/newview/llviewerobjectlist.cpp | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp
index caf19088ec..999dbaf40b 100644
--- a/indra/newview/llviewerobjectlist.cpp
+++ b/indra/newview/llviewerobjectlist.cpp
@@ -1628,15 +1628,12 @@ void LLViewerObjectList::cleanDeadObjects(BOOL use_timer)
 	{
 		// Scan for all of the dead objects and put them all on the end of the list with no ref count ops
 		objectp = *iter;
-		// <FS:Beq> catch up check removed and a guard on the if added. this allows us to skip random nulls in the list (no idea if it can happen) 
-		// if (objectp == NULL)
-		// { //we caught up to the dead tail
-		// 	break;
-		// }
+		if (objectp == NULL)
+		{ //we caught up to the dead tail
+			break;
+		}
 
-		// if objectp->isDead())
-		if (objectp && objectp->isDead())
-		// </FS:Beq>
+		if (objectp->isDead())
 		{
 			// <FS:Beq> FIRE-30694 DeadObject Spam
 			// mDeadObjects.erase(objectp->mID); // <FS:Ansariel> Use timer for cleaning up dead objects
@@ -1658,7 +1655,7 @@ void LLViewerObjectList::cleanDeadObjects(BOOL use_timer)
 
 			// <FS:Ansariel> Use timer for cleaning up dead objects
 			//if (num_removed == mNumDeadObjects || iter->isNull())
-			if (num_removed == mNumDeadObjects || vobj_list_t::reverse_iterator{iter} == target || (use_timer && timer.getElapsedTimeF64() > max_time))
+			if (num_removed == mNumDeadObjects || iter->isNull() || (use_timer && timer.getElapsedTimeF64() > max_time))
 			// </FS:Ansariel>
 			{
 				// We've cleaned up all of the dead objects or caught up to the dead tail
@@ -1687,7 +1684,7 @@ void LLViewerObjectList::cleanDeadObjects(BOOL use_timer)
 	// TODO(Beq) If this still happens, we ought to realign at this point. Do a full sweep and reset.
 	if ( mNumDeadObjects != mDeadObjects.size() )
 	{
-		LL_WARNS() << "Num dead objects (" << mNumDeadObjects << ") != dead object list size (" << mDeadObjects.size() << "),  deadlist discrepancy (" << num_divergent << ")" << LL_ENDL;
+		LL_WARNS_ONCE() << "Num dead objects (" << mNumDeadObjects << ") != dead object list size (" << mDeadObjects.size() << "),  deadlist discrepancy (" << num_divergent << ")" << LL_ENDL;
 	}
 	// </FS:Ansariel>
 }

From bba95d482bfa40bd5b035b501c9148c2e5aa39bb Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <pantera.polnocy@phoenixviewer.com>
Date: Thu, 25 Feb 2021 19:45:02 +0100
Subject: [PATCH 13/15] FIRE-29085 Minor rewording in Prefs

---
 indra/newview/skins/default/xui/en/panel_preferences_move.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_move.xml b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
index 1375827547..c8cbd6d38b 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
@@ -325,7 +325,7 @@
          follows="left|top"
          enabled_control="EnableMouselook"
          height="16"
-         label="Don't close Conversations and Radar windows when changing into Mouselook"
+         label="Keep Conversations and Radar windows open when changing into Mouselook"
          layout="topleft"
          name="FSShowConvoAndRadarInML"
          top_pad="5"

From e20cb681ef636490395e96209f7d3df815f5863c Mon Sep 17 00:00:00 2001
From: Nicky <nicky.dasmijn@gmail.com>
Date: Thu, 25 Feb 2021 21:28:32 +0100
Subject: [PATCH 14/15] Move gcc abi flag to 00-Common.cmake so it can be
 enabled for GCC only and clang on the other hand won't be bothered by it.

---
 indra/cmake/00-Common.cmake | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index 74e6669b6b..edaf2e3350 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -213,6 +213,10 @@ if (LINUX)
   endif (NOT USESYSTEMLIBS)
 
   set(CMAKE_CXX_FLAGS_DEBUG "-fno-inline ${CMAKE_CXX_FLAGS_DEBUG}")
+
+  if( NOT (CMAKE_CXX_COMPILER MATCHES ".*clang") )
+	set( CMAKE_CXX_FLAGS "-fabi-version=9 ${CMAKE_CXX_FLAGS}" ) 
+  endif()
 endif (LINUX)
 
 

From b6e034dffba46a598741a1bc566d6a943fe4215c Mon Sep 17 00:00:00 2001
From: Nicky <nicky.dasmijn@gmail.com>
Date: Thu, 25 Feb 2021 21:34:58 +0100
Subject: [PATCH 15/15] - Remove section about building viewer-development as
 LL long ago gave up on Linux. - Add section how you can build with clang if
 feeling adventurous

---
 README_BUILD_FIRESTORM_LINUX.txt | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/README_BUILD_FIRESTORM_LINUX.txt b/README_BUILD_FIRESTORM_LINUX.txt
index b7838f1c1e..2e856043a1 100755
--- a/README_BUILD_FIRESTORM_LINUX.txt
+++ b/README_BUILD_FIRESTORM_LINUX.txt
@@ -1,9 +1,5 @@
 First, make sure gcc-5.4 and g++-5.4 are installed.
 
-Ensure you can build a stock viewer-development try as described in the SL wiki. Before asking for any help 
-compiling Firestorm, make sure you can build viewer-development first. If you try and skip this step, you may
-receive  much less help. http://wiki.secondlife.com/wiki/Compiling_the_viewer_(Linux)
-
 If you want to use licensed FMOD or KDU build libraries (they are optional) you have to provision these yourself.
 If you're licensing these with Phoenix/Firestorm, ask for the libraries for fmod and kdu. Put them into:
 	/opt/firestorm
@@ -31,6 +27,9 @@ Other examples:
 	autobuild build -A64 -c ReleaseFS --no-configure -- --clean	# Clean rebuild
 	autobuild build -A64 -c ReleaseFS -- --package		# Complete a build and package it into a tarball
 
+If you want to build with clang you can call autobuild like this:
+   CC=clang CXX=clang++ autobuild configure -A64 -c ReleaseFS
+
 Any of the configure options can also be used (and do the same thing) with the build options.
 Typical LL autobuild configure options should also work, as long as they don't duplicate configuration we are
 already doing.