summaryrefslogtreecommitdiff
path: root/indra/llcommon/llstringtable.h
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2013-10-04 11:27:59 -0700
committerMerov Linden <merov@lindenlab.com>2013-10-04 11:27:59 -0700
commit98a89748789034a53f129e19d06649d79b384c52 (patch)
tree39a1aefb35402db02c8791bc3e5735c36116f426 /indra/llcommon/llstringtable.h
parent796be733b374beb5660ee2713fc28c4e69331cbd (diff)
parent1e32b9dd33fb9e2f0d9a7935a3696b423a191354 (diff)
Pull merge from viewer-fbc
Diffstat (limited to 'indra/llcommon/llstringtable.h')
-rwxr-xr-xindra/llcommon/llstringtable.h8
1 files changed, 0 insertions, 8 deletions
diff --git a/indra/llcommon/llstringtable.h b/indra/llcommon/llstringtable.h
index 59d7372ed4..ff09e71677 100755
--- a/indra/llcommon/llstringtable.h
+++ b/indra/llcommon/llstringtable.h
@@ -42,14 +42,6 @@
//# define STRING_TABLE_HASH_MAP 1
#endif
-#if STRING_TABLE_HASH_MAP
-# if LL_WINDOWS
-# include <hash_map>
-# else
-# include <ext/hash_map>
-# endif
-#endif
-
const U32 MAX_STRINGS_LENGTH = 256;
class LL_COMMON_API LLStringTableEntry