From 7773f6b4f7a72d605060f9c55a153d9f8cf0790e Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Sat, 4 May 2019 07:12:40 -0400
Subject: [PATCH] Restore the old toggle behavior of the special inventory
 floaters

---
 indra/newview/lffloaterinvpanel.h | 7 +++++++
 indra/newview/llviewermenu.cpp    | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/indra/newview/lffloaterinvpanel.h b/indra/newview/lffloaterinvpanel.h
index 51dac3369..724fed98d 100644
--- a/indra/newview/lffloaterinvpanel.h
+++ b/indra/newview/lffloaterinvpanel.h
@@ -33,6 +33,13 @@ class LFFloaterInvPanel : public LLFloater, public LLInstanceTracker<LFFloaterIn
 
 public:
 	static void show(const LLSD& cat, const std::string& name = LLStringUtil::null, LLInventoryModel* model = nullptr); // Show the floater for cat (create with other params if necessary)
+	static void toggle(const LLSD& cat)
+	{
+		if (auto instance = getInstance(cat))
+			instance->close();
+		else
+			show(cat);
+	}
 	static void closeAll(); // Called when not allowed to have inventory open
 
 	/*virtual*/ BOOL handleKeyHere(KEY key, MASK mask);
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index e2b7e52cf..8361f1863 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -8938,7 +8938,7 @@ class SinguUrlAction : public view_listener_t
 
 void show_inv_floater(const LLSD& userdata, const std::string& field)
 {
-	LFFloaterInvPanel::show(LLSD().with(field, userdata));
+	LFFloaterInvPanel::toggle(LLSD().with(field, userdata));
 }
 
 static void visible_inv_floater(const LLSD& userdata, const std::string& field)