summaryrefslogtreecommitdiff
path: root/indra/llimage
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2011-11-30 11:21:59 -0700
committerXiaohong Bao <bao@lindenlab.com>2011-11-30 11:21:59 -0700
commit6c34646aa91bdd55c39de25653710a89a7f01070 (patch)
tree71f73401f606a538fa338c99e4bdad3959e15945 /indra/llimage
parentcc2324d17de664b0dc5f4b3169b232c2c1033433 (diff)
parente6f5a57395a64b8dcfe85f20b0a63402c77a3c5f (diff)
Automated merge with https://bitbucket.org/VirLinden/viewer-development-shining-fixes
Diffstat (limited to 'indra/llimage')
-rw-r--r--indra/llimage/llimage.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llimage/llimage.cpp b/indra/llimage/llimage.cpp
index c239e3df88..56e01ac851 100644
--- a/indra/llimage/llimage.cpp
+++ b/indra/llimage/llimage.cpp
@@ -195,7 +195,7 @@ U8* LLImageBase::allocateData(S32 size)
mData = (U8*)ALLOCATE_MEM(sPrivatePoolp, size);
if (!mData)
{
- llwarns << "allocate image data: " << size << llendl;
+ llwarns << "Failed to allocate image data size [" << size << "]" << llendl;
size = 0 ;
mWidth = mHeight = 0 ;
mBadBufferAllocation = true ;