From 5219e6c455c92d789c25909d02bf094886fad3d9 Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Tue, 17 Apr 2018 19:25:28 +0300 Subject: MAINT-8325 Fixed The Save Local dialog disconnects the viewer if you do not choose the save directory files within the first minute --- indra/newview/llfilepicker.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llfilepicker.h') 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. -- cgit v1.2.3 From f2113a037c7215d0234652f6ae69c63e8b91df58 Mon Sep 17 00:00:00 2001 From: maxim_productengine Date: Thu, 31 May 2018 14:59:31 +0300 Subject: MAINT-8700 Remove obsolete code and update 'Save texture' file dialog --- indra/newview/llfilepicker.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'indra/newview/llfilepicker.h') diff --git a/indra/newview/llfilepicker.h b/indra/newview/llfilepicker.h index 7914067976..2fc496a144 100644 --- a/indra/newview/llfilepicker.h +++ b/indra/newview/llfilepicker.h @@ -198,6 +198,4 @@ public: ~LLFilePicker(); }; -const std::string upload_pick(void* data); - #endif -- cgit v1.2.3