From 2398a28af6f6c225c77b77bef422d1d2dec4a2bb Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 25 Jan 2023 20:53:01 +0200
Subject: SL-18996 [WIP] MacOS make picker dialogs non-modal to avoid
 disconnects #1

---
 indra/newview/llviewermenufile.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/newview/llviewermenufile.h')

diff --git a/indra/newview/llviewermenufile.h b/indra/newview/llviewermenufile.h
index beeac418d9..7cb2cf0d11 100644
--- a/indra/newview/llviewermenufile.h
+++ b/indra/newview/llviewermenufile.h
@@ -105,6 +105,8 @@ public:
 	void getFile();
 
 	virtual void run();
+    void runModeless();
+    static void modelessCallback(bool result, std::vector<std::string> &responses, void *user_data);
 
 	virtual void notify(const std::vector<std::string>& filenames) = 0;
 };
-- 
cgit v1.2.3


From 27080dc7f7f9a733706e0d9120b8ed805e8170c8 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 26 Jan 2023 16:58:00 +0200
Subject: SL-18996 make MacOS picker dialogs modeless to avoid disconnects #2

---
 indra/newview/llviewermenufile.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra/newview/llviewermenufile.h')

diff --git a/indra/newview/llviewermenufile.h b/indra/newview/llviewermenufile.h
index 7cb2cf0d11..61572b9996 100644
--- a/indra/newview/llviewermenufile.h
+++ b/indra/newview/llviewermenufile.h
@@ -106,7 +106,8 @@ public:
 
 	virtual void run();
     void runModeless();
-    static void modelessCallback(bool result, std::vector<std::string> &responses, void *user_data);
+    static void modelessStringCallback(bool success, std::string &response, void *user_data);
+    static void modelessVectorCallback(bool success, std::vector<std::string> &responses, void *user_data);
 
 	virtual void notify(const std::vector<std::string>& filenames) = 0;
 };
-- 
cgit v1.2.3