diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-03-16 12:33:25 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-03-16 12:33:25 -0700 |
| commit | 60c4621500e478d66a8bdc3a1c80573be2860fee (patch) | |
| tree | fa10b52caf3a54e03502058cd52d77952370cb34 /indra/llimage/llimage.cpp | |
| parent | 2e525711cd08d5f1dce991d1b6595a8dd41c9e3b (diff) | |
| parent | ba414d500ca8cb88da530c89ba373c95195ce633 (diff) | |
Automated merge from viewer/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; } |