diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2013-05-30 23:51:33 +0000 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2013-05-30 23:51:33 +0000 |
| commit | af8c2bc94868e056908b4ae2fc285925cd68b56b (patch) | |
| tree | 2fc5e74073317ecc3e7b8e64b7c3784e88ba5099 /indra/newview/llfilepicker.cpp | |
| parent | 2df0a2494691ebfdd305e6a5ee280dd758a1b337 (diff) | |
| parent | dcfb18373eca7986a73d8b9a1d34970cc0a23ed9 (diff) | |
Merge. Pull viewer-release to get the new version scheme changes.
Diffstat (limited to 'indra/newview/llfilepicker.cpp')
| -rwxr-xr-x[-rw-r--r--] | indra/newview/llfilepicker.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/llfilepicker.cpp b/indra/newview/llfilepicker.cpp index 4bf5b26b3b..d13f85baa2 100644..100755 --- a/indra/newview/llfilepicker.cpp +++ b/indra/newview/llfilepicker.cpp @@ -1103,6 +1103,7 @@ void LLFilePicker::chooser_responder(GtkWidget *widget, gint response, gpointer GtkWindow* LLFilePicker::buildFilePicker(bool is_save, bool is_folder, std::string context) { +#ifndef LL_MESA_HEADLESS if (LLWindowSDL::ll_try_gtk_init()) { GtkWidget *win = NULL; @@ -1174,6 +1175,9 @@ GtkWindow* LLFilePicker::buildFilePicker(bool is_save, bool is_folder, std::stri { return NULL; } +#else + return NULL; +#endif //LL_MESA_HEADLESS } static void add_common_filters_to_gtkchooser(GtkFileFilter *gfilter, @@ -1473,7 +1477,7 @@ BOOL LLFilePicker::getSaveFile( ESaveFilter filter, const std::string& filename return FALSE; } -BOOL LLFilePicker::getOpenFile( ELoadFilter filter ) +BOOL LLFilePicker::getOpenFile( ELoadFilter filter, bool blocking ) { // if local file browsing is turned off, return without opening dialog // (Even though this is a stub, I think we still should not return anything at all) @@ -1494,7 +1498,7 @@ BOOL LLFilePicker::getOpenFile( ELoadFilter filter ) default: break; } mFiles.push_back(filename); - llinfos << "getOpenFile: Will try to open file: " << hackyfilename << llendl; + llinfos << "getOpenFile: Will try to open file: " << filename << llendl; return TRUE; } |