diff options
author | Dave Parks <davep@lindenlab.com> | 2012-06-28 13:50:35 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2012-06-28 13:50:35 -0500 |
commit | db5d1b851a0d808dc1e8b0896fad734c2c54a03f (patch) | |
tree | ebe50ddb5e1aa700d54f50bbc1ab4b435462b85e /indra/newview/llviewerprecompiledheaders.h | |
parent | 1d8f117069945499ac297ef13eb6a916a2b96d72 (diff) | |
parent | ed72fd0ae98671f1cfce3c975b93e1f760fc40f0 (diff) |
merge
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 |