summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerprecompiledheaders.h
diff options
context:
space:
mode:
authorTodd Stinson <stinson@lindenlab.com>2012-06-22 18:59:31 -0700
committerTodd Stinson <stinson@lindenlab.com>2012-06-22 18:59:31 -0700
commit6e710333e7ea08a79c401ae54d063d8ef608f99a (patch)
treeff0dbcf29032ff9da18c8d86be7dd622ed180583 /indra/newview/llviewerprecompiledheaders.h
parent7cc44fb7fe40706e2017343d76ed226f477dad8d (diff)
parent90547ff411db177bf6424ca553449a81a808fc0f (diff)
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.
Diffstat (limited to 'indra/newview/llviewerprecompiledheaders.h')
-rw-r--r--indra/newview/llviewerprecompiledheaders.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerprecompiledheaders.h b/indra/newview/llviewerprecompiledheaders.h
index f738b84bb9..6c8a827ba3 100644
--- a/indra/newview/llviewerprecompiledheaders.h
+++ b/indra/newview/llviewerprecompiledheaders.h
@@ -57,6 +57,8 @@
#include "lldeleteutils.h"
#include "imageids.h"
#include "indra_constants.h"
+#include "llinitparam.h"
+
//#include "linden_common.h"
//#include "llpreprocessor.h"
#include "llallocator.h"
@@ -124,7 +126,5 @@
// Library includes from llmessage project
#include "llcachename.h"
-// Library includes from llxuixml
-#include "llinitparam.h"
#endif