diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2012-03-06 11:15:24 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2012-03-06 11:15:24 -0500 |
| commit | f35a662b66e93d916fc439a155aeff6446852405 (patch) | |
| tree | 884da65c01a892fdb12f6f2f69fbee90c72a4310 /indra/newview/llviewerprecompiledheaders.h | |
| parent | ca36a06d2e994178cecfae249f7f1cc3af3554a0 (diff) | |
| parent | 106bac8ed77339e7c986b3066bf96210d327898d (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/newview/llviewerprecompiledheaders.h')
| -rw-r--r-- | indra/newview/llviewerprecompiledheaders.h | 4 |
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 |