diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-04-04 15:53:09 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-04-04 15:53:09 -0400 |
| commit | 9be58e915a6c69de280ccabd3019e9ac40beed26 (patch) | |
| tree | ad6f8f1f754a865afb761d0f17744cc7e1ef8b74 /indra/newview/llfilepicker.cpp | |
| parent | ab46c9226bd9048fa218f54bc8668594401529e7 (diff) | |
| parent | 18928ea6c6f2830a0d45ec412c915eceff1b76b0 (diff) | |
merge with 4.0.3-release
Diffstat (limited to 'indra/newview/llfilepicker.cpp')
| -rw-r--r-- | indra/newview/llfilepicker.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llfilepicker.cpp b/indra/newview/llfilepicker.cpp index ef50594feb..a7236d1778 100644 --- 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 // |