Second Life viewer sources 1.18.4.0-RC

1 files changed, 57 insertions, 0 deletions

diff --git a/linden/indra/newview/lldirpicker.cpp b/linden/indra/newview/lldirpicker.cpp
index fba3782..a63c687 100644
--- a/linden/indra/newview/lldirpicker.cpp
+++ b/linden/indra/newview/lldirpicker.cpp
@@ -2,6 +2,8 @@
  * @file lldirpicker.cpp
  * @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$
  */
 
 #include "llviewerprecompiledheaders.h"
@@ -37,6 +40,10 @@
 #include "lldir.h"
 #include "llframetimer.h"
 
+#if LL_LINUX
+# include "llfilepicker.h"
+#endif
+
 //
 // Globals
 //
@@ -257,6 +264,56 @@ void LLDirPicker::reset()
         mDir    = NULL;
 }
 
+#elif LL_LINUX
+
+LLDirPicker::LLDirPicker() 
+{
+        mFilePicker = new LLFilePicker();
+        reset();
+}
+
+LLDirPicker::~LLDirPicker()
+{
+        delete mFilePicker;
+}
+
+
+void LLDirPicker::reset()
+{
+        if (mFilePicker)
+                mFilePicker->reset();
+}
+
+BOOL LLDirPicker::getDir(LLString* filename)
+{
+        reset();
+        if (mFilePicker)
+        {
+                GtkWindow* picker = mFilePicker->buildFilePicker(false, true,
+                                                                 "dirpicker");
+
+                if (picker)
+                {                  
+                   gtk_window_set_title(GTK_WINDOW(picker), "Choose Directory");
+                   gtk_widget_show_all(GTK_WIDGET(picker));
+                   gtk_main();
+                   return (NULL != mFilePicker->getFirstFile());
+                }
+        }
+        return FALSE;
+}
+
+LLString LLDirPicker::getDirName()
+{
+        if (mFilePicker)
+        {
+                const char* name = mFilePicker->getFirstFile();
+                if (name)
+                        return name;
+        }
+        return "";
+}
+
 #else // not implemented
 
 LLDirPicker::LLDirPicker()