diff options
| author | Paul ProductEngine <pguslisty@productengine.com> | 2011-09-07 18:46:51 +0300 |
|---|---|---|
| committer | Paul ProductEngine <pguslisty@productengine.com> | 2011-09-07 18:46:51 +0300 |
| commit | 955bcbb95106e9c0c5d8b75c42c32dde52cc0bb6 (patch) | |
| tree | 663ad1c3e33c002ee7ea1bfa5c86d2b713839aba /indra/llimage/llimagedxt.cpp | |
| parent | bb085a45db845a9bfe8aae83ecc7938f618e9ddc (diff) | |
| parent | 08c0de785f29801c57feebce8fae593f86113777 (diff) | |
Merge mesh-development with sh-2309
Diffstat (limited to 'indra/llimage/llimagedxt.cpp')
| -rw-r--r-- | indra/llimage/llimagedxt.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llimage/llimagedxt.cpp b/indra/llimage/llimagedxt.cpp index 4bd3efddaa..2867f5e6f0 100644 --- a/indra/llimage/llimagedxt.cpp +++ b/indra/llimage/llimagedxt.cpp @@ -429,7 +429,7 @@ bool LLImageDXT::convertToDXR() S32 nmips = calcNumMips(width,height); S32 total_bytes = getDataSize(); U8* olddata = getData(); - U8* newdata = new U8[total_bytes]; + U8* newdata = (U8*)ALLOCATE_MEM(LLImageBase::getPrivatePool(), total_bytes); if (!newdata) { llerrs << "Out of memory in LLImageDXT::convertToDXR()" << llendl; |