diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-12-15 14:05:16 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-12-15 14:05:16 -0800 |
| commit | 9cf8c3e654f38745c8a94cbd85609a17f482266a (patch) | |
| tree | 8cd1586fef29a307b9ab2bbe3711d289efdeb871 /indra/newview/lltexlayerparams.cpp | |
| parent | 1f7bf9216869682aa88c9c92b6c15d2d5278902d (diff) | |
| parent | 77aa787c019615d2fe68d31aa07434301535c992 (diff) | |
Automated merge with ssh://rick@hg.lindenlab.com/skolb/media/
Diffstat (limited to 'indra/newview/lltexlayerparams.cpp')
| -rw-r--r-- | indra/newview/lltexlayerparams.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/lltexlayerparams.cpp b/indra/newview/lltexlayerparams.cpp index 0c7e61d00e..d55468841d 100644 --- a/indra/newview/lltexlayerparams.cpp +++ b/indra/newview/lltexlayerparams.cpp @@ -30,11 +30,14 @@ */ #include "llviewerprecompiledheaders.h" + +#include "lltexlayerparams.h" + #include "llagent.h" +#include "llimagetga.h" #include "lltexlayer.h" #include "llvoavatarself.h" #include "llwearable.h" -#include "lltexlayerparams.h" #include "llui.h" //----------------------------------------------------------------------------- |