diff options
| author | rider <rider@lindenlab.com> | 2015-10-01 12:36:52 -0700 |
|---|---|---|
| committer | rider <rider@lindenlab.com> | 2015-10-01 12:36:52 -0700 |
| commit | ca81b19e80d0e0301b08bad9bd32ada937dea10d (patch) | |
| tree | 86e33382a19aa9b9f1555b8987a1a6b511b8cbe5 /indra/newview/llfilepicker.cpp | |
| parent | 17ff449ae6b2759f212daa4fd3de0a7ea2664866 (diff) | |
| parent | 4334fd27e2215c1bfad3aa7ab7130b8c6b289de5 (diff) | |
Merge for Xcode 7
Diffstat (limited to 'indra/newview/llfilepicker.cpp')
| -rwxr-xr-x | 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 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 // |