diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-11 11:34:09 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-11 11:34:09 +0000 |
| commit | 39e34dce3ea61cf9824154338beb0a452d720dd4 (patch) | |
| tree | 84af006601914d4381a09a83bb7a290371b6bd87 /indra/llimage/llimage.cpp | |
| parent | 8229fdd4902012c2d87cdd0264ad30de5cd7e0fa (diff) | |
| parent | a618a3913af506878adf59a2c5b5fb12e665e35b (diff) | |
merge from viewer-2-0
Diffstat (limited to 'indra/llimage/llimage.cpp')
| -rw-r--r-- | indra/llimage/llimage.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llimage/llimage.cpp b/indra/llimage/llimage.cpp index 5649b4cab7..7d0de18c7c 100644 --- a/indra/llimage/llimage.cpp +++ b/indra/llimage/llimage.cpp @@ -157,8 +157,9 @@ U8* LLImageBase::allocateData(S32 size) llerrs << llformat("LLImageBase::allocateData called with bad dimensions: %dx%dx%d",mWidth,mHeight,mComponents) << llendl; } } - else if (size <= 0 || (size > 4096*4096*16 && sSizeOverride == FALSE)) + if (size < 1 || (size > 4096*4096*16 && sSizeOverride == FALSE)) { + llinfos << "width: " << mWidth << " height: " << mHeight << " components: " << mComponents << llendl ; llerrs << "LLImageBase::allocateData: bad size: " << size << llendl; } |