diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2012-02-03 13:11:04 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2012-02-03 13:11:04 -0500 |
| commit | f65028e38eda00cd2329bb1ab7db0261ae6452f2 (patch) | |
| tree | 1b7601a5577dd8c439c67d615b1f987c59ceb481 /indra/newview/llviewerprecompiledheaders.h | |
| parent | 90ba675da4416a7f75f59340633e2c007b6cc029 (diff) | |
| parent | 491cd825561be1cf4a6f428a535811cbe0e3f179 (diff) | |
Automated merge with file:///Users/nat/linden/viewer-tut-fix
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 |