diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-09-10 11:51:55 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-09-10 11:51:55 -0700 |
| commit | 807aec7bafe19fca75a8f3980bd621fad7c8338e (patch) | |
| tree | f2e120963ff103524ef6206506c1ee9e0bdd3a2d /indra/llimage | |
| parent | 19026c621e338040df59adabdf7055924271f66d (diff) | |
| parent | 1f46b1d87bf4664e62131e7823ab5a7fcafe4b73 (diff) | |
Pull from lindenlab/viewer-development
Diffstat (limited to 'indra/llimage')
| -rw-r--r-- | indra/llimage/llimage.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llimage/llimage.cpp b/indra/llimage/llimage.cpp index be0ab9fcb7..5c33b675ca 100644 --- a/indra/llimage/llimage.cpp +++ b/indra/llimage/llimage.cpp @@ -147,7 +147,7 @@ U8* LLImageBase::allocateData(S32 size) size = mWidth * mHeight * mComponents; if (size <= 0) { - llerrs << llformat("LLImageBase::allocateData called with bad dimensions: %dx%dx%d",mWidth,mHeight,mComponents) << llendl; + llerrs << llformat("LLImageBase::allocateData called with bad dimensions: %dx%dx%d",mWidth,mHeight,(S32)mComponents) << llendl; } } |