From d0e82ca55670645eacc61fca39bf8667c0840de9 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Fri, 16 Feb 2024 00:02:04 +0200 Subject: jira-archive-internal#67837 Windows' bulk export of snapshots and textures SL-17661 Viewer was silently failing to 'save selection as' --- indra/newview/lldirpicker.h | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'indra/newview/lldirpicker.h') diff --git a/indra/newview/lldirpicker.h b/indra/newview/lldirpicker.h index 52febe4523..bdf7b4ddba 100644 --- a/indra/newview/lldirpicker.h +++ b/indra/newview/lldirpicker.h @@ -57,9 +57,6 @@ class LLFilePicker; class LLDirPicker { public: - // calling this before main() is undefined - static LLDirPicker& instance( void ) { return sInstance; } - BOOL getDir(std::string* filename, bool blocking = true); std::string getDirName(); @@ -87,12 +84,9 @@ private: std::string* mFileName; std::string mDir; bool mLocked; + void *pDialog; + boost::signals2::connection mEventListener; - static LLDirPicker sInstance; -#if LL_WINDOWS - BROWSEINFO bi; -#endif - public: // don't call these directly please. LLDirPicker(); -- cgit v1.2.3 From 60d3dd98a44230c21803c1606552ee098ed9fa7c Mon Sep 17 00:00:00 2001 From: Ansariel Date: Wed, 21 Feb 2024 21:05:14 +0100 Subject: Convert remaining BOOL to bool --- indra/newview/lldirpicker.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/lldirpicker.h') diff --git a/indra/newview/lldirpicker.h b/indra/newview/lldirpicker.h index bdf7b4ddba..12655229b3 100644 --- a/indra/newview/lldirpicker.h +++ b/indra/newview/lldirpicker.h @@ -57,7 +57,7 @@ class LLFilePicker; class LLDirPicker { public: - BOOL getDir(std::string* filename, bool blocking = true); + bool getDir(std::string* filename, bool blocking = true); std::string getDirName(); // clear any lists of buffers or whatever, and make sure the dir -- cgit v1.2.3