diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-09-08 13:37:27 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-09-08 13:37:27 -0400 |
| commit | 5b017f14bc323256adf29af9396bb7d22ebcf731 (patch) | |
| tree | db40c1c707786ce3a3c4254c611ffabdf31325e9 /indra/llimage | |
| parent | 074f4c8c59eebbf109c2846c35cdab05f3997db8 (diff) | |
| parent | a0611b5a01a2f1eb336d4a69808b7b7f294cbc32 (diff) | |
automated merge
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; } } |