diff options
| author | Adam Moss <moss@lindenlab.com> | 2009-02-03 17:56:26 +0000 |
|---|---|---|
| committer | Adam Moss <moss@lindenlab.com> | 2009-02-03 17:56:26 +0000 |
| commit | e188badaf29a1a02307f93864eed6737096bd9a1 (patch) | |
| tree | 767259ad3385fd9ede9722e04752bea008469f8c /indra/newview/lldirpicker.cpp | |
| parent | 4ad54702fce32905402cb6055c085ac14de188a2 (diff) | |
QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergeme
svn merge -r108355:109316
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/maint-viewer-12-uploadfees-qa108314
Whew.
Diffstat (limited to 'indra/newview/lldirpicker.cpp')
| -rw-r--r-- | indra/newview/lldirpicker.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/lldirpicker.cpp b/indra/newview/lldirpicker.cpp index c89d56474d..8b0ed39eb0 100644 --- a/indra/newview/lldirpicker.cpp +++ b/indra/newview/lldirpicker.cpp @@ -39,8 +39,9 @@ #include "llkeyboard.h" #include "lldir.h" #include "llframetimer.h" +#include "lltrans.h" -#if LL_LINUX +#if LL_LINUX || LL_SOLARIS # include "llfilepicker.h" #endif @@ -264,7 +265,7 @@ void LLDirPicker::reset() mDir.clear(); } -#elif LL_LINUX +#elif LL_LINUX || LL_SOLARIS LLDirPicker::LLDirPicker() { @@ -294,7 +295,7 @@ BOOL LLDirPicker::getDir(std::string* filename) if (picker) { - gtk_window_set_title(GTK_WINDOW(picker), "Choose Directory"); + gtk_window_set_title(GTK_WINDOW(picker), LLTrans::getString("choose_the_directory").c_str()); gtk_widget_show_all(GTK_WIDGET(picker)); gtk_main(); return (!mFilePicker->getFirstFile().empty()); |