summaryrefslogtreecommitdiff
path: root/indra/llimage/llimagedxt.cpp
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2011-10-27 16:16:57 -0700
committerLeyla Farazha <leyla@lindenlab.com>2011-10-27 16:16:57 -0700
commita09df4f840fc841870da76e904efec51d3e304b4 (patch)
tree12b434f44c4088865d9449a52c1c7648d5adacd4 /indra/llimage/llimagedxt.cpp
parent988278d236d789f490eed24a662a6ffe2be6455a (diff)
parentad4ae99c30f1293bf8266c1f53ae62161bcb68bb (diff)
merge
Diffstat (limited to 'indra/llimage/llimagedxt.cpp')
-rw-r--r--indra/llimage/llimagedxt.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llimage/llimagedxt.cpp b/indra/llimage/llimagedxt.cpp
index 2867f5e6f0..34c6793522 100644
--- a/indra/llimage/llimagedxt.cpp
+++ b/indra/llimage/llimagedxt.cpp
@@ -26,6 +26,7 @@
#include "linden_common.h"
#include "llimagedxt.h"
+#include "llmemory.h"
//static
void LLImageDXT::checkMinWidthHeight(EFileFormat format, S32& width, S32& height)