diff options
| author | Eli Linden <eli@lindenlab.com> | 2010-03-11 10:52:36 -0800 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2010-03-11 10:52:36 -0800 |
| commit | 0b6760e41165a1db4f5674d1737dc273513fa64d (patch) | |
| tree | 2dd4bcefa1536e44423cb5ccf985a3b77c647a6c /indra/llimage | |
| parent | 2e387e303f040fadc4bb2e8628eefd5c8eae5c27 (diff) | |
| parent | a618a3913af506878adf59a2c5b5fb12e665e35b (diff) | |
Merge
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; } |