summaryrefslogtreecommitdiff
path: root/indra/newview/lldirpicker.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2013-05-02 14:09:40 -0700
committerMerov Linden <merov@lindenlab.com>2013-05-02 14:09:40 -0700
commit043f2e0bfd40d29464175de838e3a36aad6e81df (patch)
treea84a7d8ab7a4b0c3a6afb3a7b2007c9ce4a36afb /indra/newview/lldirpicker.cpp
parentd07fab9e165e354678f5f8f78d331f8cfe8618d2 (diff)
parent1beb15c93b139e4494bb90cce30b1c67accb4b08 (diff)
Pull from viewer-release
Diffstat (limited to 'indra/newview/lldirpicker.cpp')
-rw-r--r--indra/newview/lldirpicker.cpp4
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;
}