summaryrefslogtreecommitdiff
path: root/indra/llcommon/llstring.h
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-07-19 15:03:05 -0700
committerRichard Linden <none@none>2013-07-19 15:03:05 -0700
commite40065f82c797eab41006a448c838f4f1089a2e8 (patch)
tree7abaeeae98304308bc3812531f682de3cda4bb72 /indra/llcommon/llstring.h
parenteb8d552df76540e7b0b533f0c10c5faa541299a4 (diff)
BUILDFIX: #include and dependency cleanup
Diffstat (limited to 'indra/llcommon/llstring.h')
-rwxr-xr-xindra/llcommon/llstring.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/llcommon/llstring.h b/indra/llcommon/llstring.h
index 17893c1910..fdf9f3ce89 100755
--- a/indra/llcommon/llstring.h
+++ b/indra/llcommon/llstring.h
@@ -29,10 +29,11 @@
#include <string>
#include <cstdio>
-#include <locale>
+//#include <locale>
#include <iomanip>
#include <algorithm>
-#include "llsd.h"
+#include <vector>
+#include <map>
#include "llformat.h"
#if LL_LINUX || LL_SOLARIS
@@ -50,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)