summaryrefslogtreecommitdiff
path: root/indra/llimage/llimagedxt.cpp
diff options
context:
space:
mode:
authorDebi King (Dessie) <dessie@lindenlab.com>2011-10-16 08:19:49 -0400
committerDebi King (Dessie) <dessie@lindenlab.com>2011-10-16 08:19:49 -0400
commitbf96c7f67e623b09f83b2300e7b82cb04dce1ee3 (patch)
tree3d3ff515c4055877d2f1158287ddaf9dd5107a13 /indra/llimage/llimagedxt.cpp
parent76a54429fef78bb36ef5d4189e78867a7002f058 (diff)
parent4924f0c99b021869967f4587df703084d2bdc8ed (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)