summaryrefslogtreecommitdiff
path: root/indra/newview/llviewertexture.cpp
diff options
context:
space:
mode:
authorGeenz <geenz@geenzo.com>2013-01-24 16:36:31 -0500
committerGeenz <geenz@geenzo.com>2013-01-24 16:36:31 -0500
commitf39532c407229403f6d67312638bf5dc3514687d (patch)
treede0f376b3bbe03d585f989adf02c3eadb01347f2 /indra/newview/llviewertexture.cpp
parenta82ff3fcb7556bd810ec37c0b74c565b42e92250 (diff)
parenta30a2c492d06c9ef843a43c0ff0be6f2826d6d0b (diff)
Merged with latest viewer-dev.
Diffstat (limited to 'indra/newview/llviewertexture.cpp')
-rw-r--r--indra/newview/llviewertexture.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp
index 96d7890a9e..08fcb60d03 100644
--- a/indra/newview/llviewertexture.cpp
+++ b/indra/newview/llviewertexture.cpp
@@ -39,7 +39,6 @@
#include "llimagebmp.h"
#include "llimagej2c.h"
#include "llimagetga.h"
-#include "llmemtype.h"
#include "llstl.h"
#include "llvfile.h"
#include "llvfs.h"