1 files changed, 16 insertions, 2 deletions

diff --git a/linden/indra/newview/llfilepicker.h b/linden/indra/newview/llfilepicker.h
index 008c96e..d4b0ebe 100644
--- a/linden/indra/newview/llfilepicker.h
+++ b/linden/indra/newview/llfilepicker.h
@@ -2,6 +2,8 @@
  * @file llfilepicker.h
  * @brief OS-specific file picker
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 // OS specific file selection dialog. This is implemented as a
@@ -70,11 +73,16 @@
 typedef struct {
         GtkWidget *win;
         std::vector<LLString> fileVector;
+        std::string contextName;
 } StoreFilenamesStruct;
 #endif // LL_GTK
 
 class LLFilePicker
 {
+#ifdef LL_GTK
+        friend class LLDirPicker;
+        friend void chooser_responder(GtkWidget *, gint, gpointer);
+#endif // LL_GTK
 public:
         // calling this before main() is undefined
         static LLFilePicker& instance( void ) { return sInstance; }
@@ -166,9 +174,9 @@ private:
 
 #if LL_GTK
         StoreFilenamesStruct mStoreFilenames;
-
-        GtkWindow* buildFilePicker(void);
         U32 mNextFileIndex;
+        // we remember the last path that was accessed for a particular usage
+        static std::map <std::string, std::string> sContextToPathMap;
 #endif
 
         char mFiles[FILENAME_BUFFER_SIZE];      /*Flawfinder: ignore*/
@@ -179,6 +187,12 @@ private:
 
         static LLFilePicker sInstance;
         
+protected:
+#if LL_GTK
+        GtkWindow* buildFilePicker(bool is_save, bool is_folder,
+                                   std::string context = "generic");
+#endif
+
 public:
         // don't call these directly please.
         LLFilePicker();