diff options
| author | Richard Linden <none@none> | 2014-04-07 19:09:40 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2014-04-07 19:09:40 -0700 |
| commit | 98aabdc176c23de9ba23f902dc2015f9c775d26e (patch) | |
| tree | 5ac6ffdb8e9be8d3c2a2f8b591c9971726c6b73c /indra/llcommon/llstring.h | |
| parent | 7e966f28da79d2d24f93a2615c8807421300700c (diff) | |
| parent | e5bbdafdeda0f2e6bbe97d59a24ca398b54c31eb (diff) | |
merge with release
Diffstat (limited to 'indra/llcommon/llstring.h')
| -rwxr-xr-x | indra/llcommon/llstring.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/indra/llcommon/llstring.h b/indra/llcommon/llstring.h index 16a19e7021..0177f48bf5 100755 --- a/indra/llcommon/llstring.h +++ b/indra/llcommon/llstring.h @@ -29,10 +29,12 @@ #include <string> #include <cstdio> -#include <locale> +//#include <locale> #include <iomanip> -#include "llsd.h" -#include "llfasttimer.h" +#include <algorithm> +#include <vector> +#include <map> +#include "llformat.h" #if LL_LINUX || LL_SOLARIS #include <wctype.h> @@ -49,6 +51,7 @@ #endif const char LL_UNKNOWN_CHAR = '?'; +class LLSD; #if LL_DARWIN || LL_LINUX || LL_SOLARIS // Template specialization of char_traits for U16s. Only necessary on Mac and Linux (exists on Windows already) |