diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-09-16 20:09:36 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-09-16 20:09:36 -0700 |
| commit | 8ada6ed3cf562d33cc66f2a5d664b5e1f40e1f0c (patch) | |
| tree | a6430d873ca02f5cee683c95a3a4747c16f8aace /indra/llimage/llimage.cpp | |
| parent | 657f75b89de4cfd5ade82e3bc30e236cd2533017 (diff) | |
| parent | 30c8979e157a4503509360f0c70d609eb97d6db9 (diff) | |
Pull update from viewer-development
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; } } |