diff options
| author | Richard Linden <none@none> | 2013-12-02 14:57:29 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-12-02 14:57:29 -0800 |
| commit | 34ff2fc46ba8c623f0eab8fe1dccb5db327775a8 (patch) | |
| tree | 7bc422dd969e1d18e9d83e52a9a6dcfa2bd6139f /indra/llcommon/llstring.h | |
| parent | 787ccaf297e81291469aaf269f563d862fb150a3 (diff) | |
| parent | d8e92867162f8c4ff9489d8eefde53546e907dff (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 f9702868c8..fdf9f3ce89 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) |