diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-09-26 18:25:26 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-09-26 18:25:26 -0400 |
| commit | a43d242d00ef06934f9473444297fffe50760f93 (patch) | |
| tree | 6f557d2a183f626d7b53c4ecf0f9678439c90ce7 /indra/newview/lldirpicker.cpp | |
| parent | 0bb1324a27d4dd94d6f8a9d445ab892127f48c5f (diff) | |
| parent | 95f3fb45ae2f4fe199e34f35be1e46b3a598ca1a (diff) | |
merge
Diffstat (limited to 'indra/newview/lldirpicker.cpp')
| -rw-r--r-- | indra/newview/lldirpicker.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/lldirpicker.cpp b/indra/newview/lldirpicker.cpp index 1e03582a29..d7d9f82910 100644 --- a/indra/newview/lldirpicker.cpp +++ b/indra/newview/lldirpicker.cpp @@ -327,6 +327,8 @@ BOOL LLDirPicker::getDir(std::string* filename) return FALSE; } +#if !LL_MESA_HEADLESS + if (mFilePicker) { GtkWindow* picker = mFilePicker->buildFilePicker(false, true, @@ -340,6 +342,8 @@ BOOL LLDirPicker::getDir(std::string* filename) return (!mFilePicker->getFirstFile().empty()); } } +#endif // !LL_MESA_HEADLESS + return FALSE; } |