diff options
author | niel@nirvana-win7hp.planescape.home <niel@nirvana-win7hp.planescape.home> | 2011-10-26 01:42:26 +0100 |
---|---|---|
committer | niel@nirvana-win7hp.planescape.home <niel@nirvana-win7hp.planescape.home> | 2011-10-26 01:42:26 +0100 |
commit | 4fd9a53115bf85ffe17974323d5fa609e0df960c (patch) | |
tree | 7968008d0fa7c0347d637e1fb19add9d436b926d /indra/llimage/llimagedxt.cpp | |
parent | 42c166e451d362609d83fb17261f9e8f344e974d (diff) | |
parent | b7a349f231977d5917b29faacca143a85d925576 (diff) |
Merge STORM-959
Diffstat (limited to 'indra/llimage/llimagedxt.cpp')
-rw-r--r-- | indra/llimage/llimagedxt.cpp | 1 |
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) |