diff options
| author | callum <none@none> | 2011-10-28 11:01:11 -0700 |
|---|---|---|
| committer | callum <none@none> | 2011-10-28 11:01:11 -0700 |
| commit | b94f45db81fa6a4625d58301a13f964996fa65bd (patch) | |
| tree | 1c9134e08ce22f4e122c48e3a746259a8f7ef470 /indra/llimage/llimagedxt.cpp | |
| parent | d08d018323272866b189979d0e772d50cdece4b2 (diff) | |
| parent | f84a69a7e00f0eed49894e14336126849a9e7b29 (diff) | |
Merge with head
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) |