diff options
| author | Andrey Lihatskiy <andreylproductengine@lindenlab.com> | 2018-05-25 08:35:51 +0000 |
|---|---|---|
| committer | Andrey Lihatskiy <andreylproductengine@lindenlab.com> | 2018-05-25 08:35:51 +0000 |
| commit | bcb5336958e30bf56b2f327235c3731407b34530 (patch) | |
| tree | 384c333370a24fca38c77b0cd72f195a1a0ce882 /indra/newview/llfilepicker.h | |
| parent | a28a3b756d7688fcb917122efee01f16ab5319cd (diff) | |
| parent | 5219e6c455c92d789c25909d02bf094886fad3d9 (diff) | |
Merged in andreyl_productengine/viewer-neko-marchcat (pull request #613)
MAINT-8325 Fixed The Save Local dialog disconnects the viewer if you do not choose the save directory files within the first minute
Approved-by: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Diffstat (limited to 'indra/newview/llfilepicker.h')
| -rw-r--r-- | indra/newview/llfilepicker.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfilepicker.h b/indra/newview/llfilepicker.h index b6e67375cd..7914067976 100644 --- a/indra/newview/llfilepicker.h +++ b/indra/newview/llfilepicker.h @@ -113,9 +113,9 @@ public: }; // open the dialog. This is a modal operation - BOOL getSaveFile( ESaveFilter filter = FFSAVE_ALL, const std::string& filename = LLStringUtil::null ); + BOOL getSaveFile( ESaveFilter filter = FFSAVE_ALL, const std::string& filename = LLStringUtil::null, bool blocking = true); BOOL getOpenFile( ELoadFilter filter = FFLOAD_ALL, bool blocking = true ); - BOOL getMultipleOpenFiles( ELoadFilter filter = FFLOAD_ALL ); + BOOL getMultipleOpenFiles( ELoadFilter filter = FFLOAD_ALL, bool blocking = true ); // Get the filename(s) found. getFirstFile() sets the pointer to // the start of the structure and allows the start of iteration. |