From b4afa5f1b8b04d69eb905741ee1f05e7eb3b027e Mon Sep 17 00:00:00 2001
From: Nicky <nicky.dasmijn@gmail.com>
Date: Sun, 14 Feb 2021 14:05:51 +0100
Subject: [PATCH 1/2] Update jemalloc.

---
 autobuild.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index c738ea6aef..bcb424112c 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -22,9 +22,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>aa31ee4c6315cb26bf6e2191b69598f5</string>
+              <string>1f887cbafc0fe2af1e85783de0f14102</string>
               <key>url</key>
-              <string>http://3p.firestormviewer.org/jemalloc-5.1.0-linux64-190582149.tar.bz2</string>
+              <string>http://3p.firestormviewer.org/jemalloc-5.2.1-linux64-210451204.tar.bz2</string>
             </map>
             <key>name</key>
             <string>linux64</string>

From 719158dac444f023ccbfa08906e5e27796cf7e2e Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Sun, 14 Feb 2021 16:09:48 +0100
Subject: [PATCH 2/2] Undo needless check

---
 indra/newview/llinventorymodel.cpp | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index ea4e888a64..d3cc03914f 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -1061,13 +1061,7 @@ U32 LLInventoryModel::updateItem(const LLViewerInventoryItem* item, U32 mask)
 		LLUUID new_parent_id = item->getParentUUID();
 		bool update_parent_on_server = false;
 
-//		if (new_parent_id.isNull() && !LLApp::isExiting())
-// [SL:KB] - Patch: Appearance-Misc | Checked: Catznip-6.4
-		// The problem seems to be the 'LogoutReply' message so don't reparent anything to the LNF folder
-		// as soon as we've sent out the log out request (since the quitting state is only set >after< we
-		// start processing the logout response)
-		if ( (new_parent_id.isNull()) && (!LLAppViewer::instance()->logoutRequestSent()) && (!LLApp::isExiting()) )
-// [/SL:KB]
+		if (new_parent_id.isNull() && !LLApp::isExiting())
 		{
             if (old_parent_id.isNull())
             {