Merged working branch of 1.2 into LL 1.23 merge

1 files changed, 18 insertions, 0 deletions

diff --git a/linden/indra/newview/llfilepicker.cpp b/linden/indra/newview/llfilepicker.cpp
index 8f58826..60fa608 100644
--- a/linden/indra/newview/llfilepicker.cpp
+++ b/linden/indra/newview/llfilepicker.cpp
@@ -329,6 +329,18 @@ BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const std::string& filename)
                         L"Targa, Bitmap Images (*.tga; *.bmp)\0*.tga;*.bmp\0" \
                         L"\0";
                 break;
+        case FFSAVE_TEXT:
+                if (filename.empty())
+                {
+                        wcsncpy( mFilesW,L"untitled.txt", FILENAME_BUFFER_SIZE);        /*Flawfinder: ignore*/
+                }
+                mOFN.lpstrDefExt = L"txt";
+                mOFN.lpstrFilter = 
+                        L"Text files (*.txt)\0*.txt\0"
+                        L"RTF Files (*.rtf)\0*.rtf\0"
+                        L"LSL Files (*.lsl)\0*.lsl\0"
+                        L"\0";
+                break;
         case FFSAVE_WAV:
                 if (filename.empty())
                 {
@@ -996,6 +1008,12 @@ GtkWindow* LLFilePicker::buildFilePicker(bool is_save, bool is_folder, std::stri
                                 (GTK_FILE_CHOOSER(win),
                                  this_path->second.c_str());
                 }
+                else if (getenv("HOME"))
+                {
+                        gtk_file_chooser_set_current_folder
+                                (GTK_FILE_CHOOSER(win),
+                                 getenv("HOME"));
+                }
 
 #  if LL_X11
                 // Make GTK tell the window manager to associate this