summaryrefslogtreecommitdiff
path: root/indra/newview/llviewertexture.cpp
diff options
context:
space:
mode:
authormaxim@mnikolenko <maxim@mnikolenko>2013-01-31 19:25:42 +0200
committermaxim@mnikolenko <maxim@mnikolenko>2013-01-31 19:25:42 +0200
commit2ec0d24e4a0beac5afba992b37f97c30d972342b (patch)
tree55842c2c5238b75a70eb99c3356fe99196530dc7 /indra/newview/llviewertexture.cpp
parent8714b610149a5ae7b6f248023722f237c9336472 (diff)
parent22835e1ddb39341df26681dde8d22c673cc3940b (diff)
Merge
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"