diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2012-02-12 21:59:51 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2012-02-12 21:59:51 -0500 |
| commit | 6da3f0907cea3748adb6be9a7c393835109adf3b (patch) | |
| tree | 8a569f192a49913db7365c97548c1227a123127e /indra/newview/llviewerprecompiledheaders.h | |
| parent | 8804fa524c084edb9f49f4122e2c7330a80c79b5 (diff) | |
| parent | 90a1b67cc43792e1ca0047eaca51530aa14e134c (diff) | |
Automated merge with ssh://hg.lindenlab.com/nat/viewer-new-apr
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 |