diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-09-08 16:11:54 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-09-08 16:11:54 -0500 |
| commit | a114783a7b609711c691bcd37cdb81de369a6638 (patch) | |
| tree | 09bb6ae5bd3e2e913ddeeca55067f787e51a2380 /indra/llimage/llimage.cpp | |
| parent | 35ad7ace9071e73056690c1212b31cd001985b9f (diff) | |
| parent | 4a8d59367a695fedff21a71d35bcad3f729f6060 (diff) | |
merge
Diffstat (limited to 'indra/llimage/llimage.cpp')
| -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; } } |