diff options
| author | Kent Quirk <q@lindenlab.com> | 2010-03-23 23:02:02 -0400 |
|---|---|---|
| committer | Kent Quirk <q@lindenlab.com> | 2010-03-23 23:02:02 -0400 |
| commit | 62ebb4533ceff1d0a7cf68a6385a8d3b34fa51d4 (patch) | |
| tree | dd6cd1b313f933847c6e603d50a65ffbc82fee01 /indra/llimage | |
| parent | 3ad56f22158dd2665204745af2171689f208cd7e (diff) | |
| parent | ea8f1b80df0fcfcdbb52123b2ece68916ed139ff (diff) | |
Merge from viewer-2-0
Diffstat (limited to 'indra/llimage')
| -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; } |