diff options
| author | callum_linden <none@none> | 2018-04-12 15:22:25 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2018-04-12 15:22:25 -0700 |
| commit | 6c953d0bde107059db75d01cd30326a31cd0de54 (patch) | |
| tree | c41563bccdcccc3bb263cca68c12f90ce0dbde88 /indra/llimage/llimage.cpp | |
| parent | bdd7bdf390775860fb26a6c7d0923f45bb20256c (diff) | |
| parent | 41f4e854732a7c75a813b2e99285cc41bde13e5e (diff) | |
Automated merge with tip of viewer-release after Viewer Media Update release
Diffstat (limited to 'indra/llimage/llimage.cpp')
| -rw-r--r-- | indra/llimage/llimage.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/llimage/llimage.cpp b/indra/llimage/llimage.cpp index cd7125197c..4a76d15096 100644 --- a/indra/llimage/llimage.cpp +++ b/indra/llimage/llimage.cpp @@ -748,7 +748,11 @@ U8* LLImageBase::allocateData(S32 size) { size = 0; mWidth = mHeight = 0; - mData = NULL; + if (mData) + { + deleteData(); // virtual + mData = NULL; + } } mDataSize = size; claimMem(mDataSize); @@ -775,6 +779,7 @@ U8* LLImageBase::reallocateData(S32 size) disclaimMem(mDataSize); mDataSize = size; claimMem(mDataSize); + mBadBufferAllocation = false; return mData; } |