summaryrefslogtreecommitdiff
path: root/indra/newview/llviewertexture.cpp
diff options
context:
space:
mode:
authormberezhnoy <mberezhnoy@productengine.com>2013-02-01 01:00:52 +0200
committermberezhnoy <mberezhnoy@productengine.com>2013-02-01 01:00:52 +0200
commit8fbc0aada88c6a3743f61dfc57018385a31802f0 (patch)
tree56888fe7f24736cce1980e08d349d20f84b814ed /indra/newview/llviewertexture.cpp
parenta12200b91b0ca20dfff2df8aa71c6f53ac0603ee (diff)
parentd2a17e20ca889851406f22907df35b17f5030279 (diff)
merging
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"