diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-09-10 10:22:25 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-09-10 10:22:25 +0100 |
| commit | 8a21f5e24145835db65e486bdca5692d2b4d8979 (patch) | |
| tree | eff902c19f0892dff1f2f21783a109bc5382155d /indra/llimage/llimage.cpp | |
| parent | 3296f3b86452fddc840a3cb140d600fe0d5351dd (diff) | |
| parent | 820cffd56df5204e2aa0ceb6ce556a318dfaad7b (diff) | |
merge the latest ECC/Shining sprint work. http://bitbucket.org/seraph/viewer-development-shining
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; } } |