diff options
| author | Samuel Kolb <skolb@lindenlab.com> | 2009-12-16 12:04:38 -0800 |
|---|---|---|
| committer | Samuel Kolb <skolb@lindenlab.com> | 2009-12-16 12:04:38 -0800 |
| commit | bedde40e9475f3772807b6fc48c3039d5993f578 (patch) | |
| tree | ae615503b4c917667a5a0b752dd0a6eca2927e9b /indra/newview/lltexlayer.cpp | |
| parent | d7533a2c0646826088d5c1f58c84604c0607b8aa (diff) | |
| parent | 0c0cb6fd79d12016b32bb74ce0e9d2c656143902 (diff) | |
local merge
Diffstat (limited to 'indra/newview/lltexlayer.cpp')
| -rw-r--r-- | indra/newview/lltexlayer.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/lltexlayer.cpp b/indra/newview/lltexlayer.cpp index 8d3dcf8a99..72ef383be9 100644 --- a/indra/newview/lltexlayer.cpp +++ b/indra/newview/lltexlayer.cpp @@ -31,8 +31,14 @@ */ #include "llviewerprecompiledheaders.h" -#include "llagent.h" + #include "lltexlayer.h" + +#include "llagent.h" +#include "llimagej2c.h" +#include "llimagetga.h" +#include "llvfile.h" +#include "llvfs.h" #include "llviewerstats.h" #include "llviewerregion.h" #include "llvoavatar.h" |