diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2012-03-21 13:03:04 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2012-03-21 13:03:04 -0400 |
| commit | 3238cebcb098cfb36aeeee37a7498d569ab04955 (patch) | |
| tree | 4459c297533a53bc93dfb11316552805c3ff4500 /indra/newview/llviewerprecompiledheaders.h | |
| parent | b187aeb8f177bd76e792652e773617beff18b47b (diff) | |
| parent | cabb6b6a5f339a69fec25b836f46b8b470eebb90 (diff) | |
Automated merge with http://hg.secondlife.com/viewer-release
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 |