From 0e2dc856e73a34257d4b33d1ac4639798d94a87b Mon Sep 17 00:00:00 2001
From: Testy <automatic@null.net>
Date: Thu, 20 Feb 2020 19:33:51 -0400
Subject: [PATCH] Fix so that when uploading content, the inventory won't
 switch away from the "Recent Items" tab.

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

diff --git a/indra/newview/llviewerassetupload.cpp b/indra/newview/llviewerassetupload.cpp
index d7b9163262..e65c745c8e 100644
--- a/indra/newview/llviewerassetupload.cpp
+++ b/indra/newview/llviewerassetupload.cpp
@@ -822,7 +822,12 @@ void LLViewerAssetUpload::AssetInventoryUploadCoproc(LLCoreHttpUtil::HttpCorouti
                 sidepanel_inventory->showInventoryPanel();
             }
             // </FS:Ansariel>
-            LLInventoryPanel::openInventoryPanelAndSetSelection(TRUE, serverInventoryItem, TRUE, TAKE_FOCUS_NO, (panel == NULL));
+
+            // <FS:Testy> FIRE-22943: Don't switch away from the "Recent Items" tab.
+            //LLInventoryPanel::openInventoryPanelAndSetSelection(TRUE, serverInventoryItem, TRUE, TAKE_FOCUS_NO, (panel == NULL));
+            BOOL show_main_panel = (!panel || panel->getName() != "Recent Items");
+            LLInventoryPanel::openInventoryPanelAndSetSelection(TRUE, serverInventoryItem, show_main_panel, TAKE_FOCUS_NO, (panel == NULL));
+            // </FS:Testy>
 
             // restore keyboard focus
             gFocusMgr.setKeyboardFocus(focus);