summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerprecompiledheaders.h
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2012-11-08 13:05:29 -0600
committerDave Parks <davep@lindenlab.com>2012-11-08 13:05:29 -0600
commitc431ddf629b7f1149c44b2063d216dd34bcd2b12 (patch)
tree7c625873abf2ad80fc25e90e073ff0fcc2e619ab /indra/newview/llviewerprecompiledheaders.h
parentb76b81ff811014012856f58970c1aac093507557 (diff)
parent8c8c2f3b940059f82777c9b0b9f40e4d2f7bc6ab (diff)
Automated merge with http://bitbucket.org/lindenlab/viewer-development
Diffstat (limited to 'indra/newview/llviewerprecompiledheaders.h')
-rw-r--r--indra/newview/llviewerprecompiledheaders.h7
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"