diff options
| author | Dave Parks <davep@lindenlab.com> | 2023-03-31 11:57:48 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2023-03-31 11:57:48 -0500 |
| commit | 7d144fcb2a1b0aff1b59e378c652649c3d03e94f (patch) | |
| tree | de3bfe3ce90677cc4d7ab25b8aeaf5853c009068 /indra/newview/llfilepicker.cpp | |
| parent | 0fe09bd968b987605123e99efb2fa040a988a942 (diff) | |
| parent | e4173ea5cc1ef9b1677ac87a0f7c8acbe73414ee (diff) | |
Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/llfilepicker.cpp')
| -rw-r--r-- | indra/newview/llfilepicker.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfilepicker.cpp b/indra/newview/llfilepicker.cpp index 014c8a4d2d..e63ab44e16 100644 --- a/indra/newview/llfilepicker.cpp +++ b/indra/newview/llfilepicker.cpp @@ -1213,7 +1213,7 @@ static std::string add_save_texture_filter_to_gtkchooser(GtkWindow *picker) return caption; } -BOOL LLFilePicker::getSaveFile( ESaveFilter filter, const std::string& filename ) +BOOL LLFilePicker::getSaveFile( ESaveFilter filter, const std::string& filename, bool blocking ) { BOOL rtn = FALSE; @@ -1433,7 +1433,7 @@ BOOL LLFilePicker::getMultipleOpenFiles( ELoadFilter filter, bool blocking) // Hacky stubs designed to facilitate fake getSaveFile and getOpenFile with // static results, when we don't have a real filepicker. -BOOL LLFilePicker::getSaveFile( ESaveFilter filter, const std::string& filename ) +BOOL LLFilePicker::getSaveFile( ESaveFilter filter, const std::string& filename, bool blocking ) { // if local file browsing is turned off, return without opening dialog // (Even though this is a stub, I think we still should not return anything at all) |