summaryrefslogtreecommitdiff
path: root/indra/llimage/llimagedxt.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2011-10-18 16:24:23 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2011-10-18 16:24:23 -0400
commit1f172281453171175dea76fc469a358e1e932b60 (patch)
tree0ba3c9b4ad692f1e133d8b2495f69ebe6daebce4 /indra/llimage/llimagedxt.cpp
parentaf0be560002d4de4d9d89709b5d3b4cc1aef31fc (diff)
parent9785506d56ced75011e8535148ef8a9b937d4970 (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)