diff options
| author | Richard Nelson <none@none> | 2010-03-10 18:29:25 -0800 |
|---|---|---|
| committer | Richard Nelson <none@none> | 2010-03-10 18:29:25 -0800 |
| commit | 27db10b5265b51ea06803becb2e899068352ed32 (patch) | |
| tree | 14398b249cbd5d1b8e230b03c9919a0d06fc105e /indra/llimage/llimage.cpp | |
| parent | f6754b9fd09754c7ec9e3d8082631c4fa8151aa7 (diff) | |
| parent | ebc63494b3a7791be00c91ca51387a73c975f912 (diff) | |
merge
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; } |