diff options
| author | callum_linden <none@none> | 2018-03-01 14:33:47 -0800 |
|---|---|---|
| committer | callum_linden <none@none> | 2018-03-01 14:33:47 -0800 |
| commit | f4867d032dfe93b249eb188f071cb309e3a7b23e (patch) | |
| tree | 144bb92ed630302d1d68910069ad2505946eb471 /indra/llimage/llimage.cpp | |
| parent | 278382abd72a02b5e190cb259d2b4806f3908902 (diff) | |
| parent | f8c76535a35aaf245e261357a59e977bac5b2501 (diff) | |
Automated merge with tip of viewer-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; } |