diff options
author | Richard Linden <none@none> | 2012-08-07 19:56:59 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2012-08-07 19:56:59 -0700 |
commit | af8653d7598418e929718ede6742589719ffb2fb (patch) | |
tree | 2744b56414fc48db5661ee11ce48ac5e8a26f021 /indra/newview/llviewerprecompiledheaders.h | |
parent | 03dd09b1620b8331529f6aae742b2d341c29ce0d (diff) | |
parent | c8a36e9cfd1e90a1aa385667c7272c25e2ef9136 (diff) |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting
Diffstat (limited to 'indra/newview/llviewerprecompiledheaders.h')
-rw-r--r-- | indra/newview/llviewerprecompiledheaders.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/indra/newview/llviewerprecompiledheaders.h b/indra/newview/llviewerprecompiledheaders.h index 6c8a827ba3..0316f79973 100644 --- a/indra/newview/llviewerprecompiledheaders.h +++ b/indra/newview/llviewerprecompiledheaders.h @@ -59,8 +59,6 @@ #include "indra_constants.h" #include "llinitparam.h" -//#include "linden_common.h" -//#include "llpreprocessor.h" #include "llallocator.h" #include "llapp.h" #include "llcriticaldamp.h" @@ -77,10 +75,8 @@ #include "llprocessor.h" #include "llrefcount.h" #include "llsafehandle.h" -//#include "llsecondlifeurls.h" #include "llsd.h" #include "llsingleton.h" -#include "llstat.h" #include "llstl.h" #include "llstrider.h" #include "llstring.h" @@ -88,11 +84,8 @@ #include "llthread.h" #include "lltimer.h" #include "lluuidhashmap.h" -//#include "processor.h" #include "stdenums.h" #include "stdtypes.h" -//#include "string_table.h" -//#include "timer.h" #include "timing.h" #include "u64.h" |