summaryrefslogtreecommitdiff
path: root/indra/newview/llfilepicker.cpp
diff options
context:
space:
mode:
authorMnikolenko Productengine <mnikolenko@productengine.com>2016-05-10 16:09:25 +0300
committerMnikolenko Productengine <mnikolenko@productengine.com>2016-05-10 16:09:25 +0300
commitb1243c55e5579f72e3dd9dafe2b53173349a047f (patch)
tree9d9e0b018059483973a8e6f76644b0875d2534a3 /indra/newview/llfilepicker.cpp
parent042930b59a82f706f16e4b67a683697aed65112f (diff)
parent7f5e6cea124e1193b199a3eabd50bdab96340c13 (diff)
Merged in oz_linden/maint-5974
Diffstat (limited to 'indra/newview/llfilepicker.cpp')
-rwxr-xr-xindra/newview/llfilepicker.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llfilepicker.cpp b/indra/newview/llfilepicker.cpp
index ef50594feb..a7236d1778 100755
--- a/indra/newview/llfilepicker.cpp
+++ b/indra/newview/llfilepicker.cpp
@@ -40,6 +40,10 @@
#include "llwindowsdl.h" // for some X/GTK utils to help with filepickers
#endif // LL_SDL
+#if LL_LINUX || LL_SOLARIS
+#include "llhttpconstants.h" // file picker uses some of thes constants on Linux
+#endif
+
//
// Globals
//