diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-01-25 20:53:01 +0200 |
|---|---|---|
| committer | akleshchev <117672381+akleshchev@users.noreply.github.com> | 2023-01-27 17:25:18 +0200 |
| commit | 2398a28af6f6c225c77b77bef422d1d2dec4a2bb (patch) | |
| tree | 518dd7f9e6bb477d74016e8b787594bf9299e9c1 /indra/newview/llfilepicker.h | |
| parent | e3a90ba4c1b7fffbb27361155dd67f86097f9a4d (diff) | |
SL-18996 [WIP] MacOS make picker dialogs non-modal to avoid disconnects #1
Diffstat (limited to 'indra/newview/llfilepicker.h')
| -rw-r--r-- | indra/newview/llfilepicker.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llfilepicker.h b/indra/newview/llfilepicker.h index 04ba4416d7..04adeb8526 100644 --- a/indra/newview/llfilepicker.h +++ b/indra/newview/llfilepicker.h @@ -115,7 +115,11 @@ public: // open the dialog. This is a modal operation BOOL getSaveFile( ESaveFilter filter = FFSAVE_ALL, const std::string& filename = LLStringUtil::null, bool blocking = true); BOOL getOpenFile( ELoadFilter filter = FFLOAD_ALL, bool blocking = true ); + // Todo: implement getOpenFileModeless and getMultipleOpenFilesModeless + // for windows and use directly instead of ugly LLFilePickerThread + BOOL getOpenFileModeless( ELoadFilter filter, void (*callback)(bool, std::vector<std::string> &, void*), void *userdata); // MAC only. BOOL getMultipleOpenFiles( ELoadFilter filter = FFLOAD_ALL, bool blocking = true ); + BOOL getMultipleOpenFilesModeless( ELoadFilter filter, void (*callback)(bool, std::vector<std::string> &, void*), void *userdata ); // MAC only // Get the filename(s) found. getFirstFile() sets the pointer to // the start of the structure and allows the start of iteration. @@ -166,6 +170,7 @@ private: std::vector<std::string> mFileVector; bool doNavChooseDialog(ELoadFilter filter); + bool doNavChooseDialogModeless(ELoadFilter filter, void (*callback)(bool, std::vector<std::string>&, void*), void *userdata); bool doNavSaveDialog(ESaveFilter filter, const std::string& filename); std::vector<std::string>* navOpenFilterProc(ELoadFilter filter); #endif |