summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorNyx (Neal Orman) <nyx@lindenlab.com>2010-02-10 12:15:20 -0500
committerNyx (Neal Orman) <nyx@lindenlab.com>2010-02-10 12:15:20 -0500
commitaa55ce78e38c2ea32403a114e0aedf3eeaf70627 (patch)
tree565b3557cd33cef4726e46d10429cbd02d36af29 /indra
parent1307c384ad1d039de19007237f2670fc757ef2ad (diff)
parentf8e22b3e285c08e95ed8cedfeeff4912c8b82b58 (diff)
Automated merge with ssh://nyx@hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llvoavatar.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 4235f97eab..afe325856b 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -4048,6 +4048,7 @@ void LLVOAvatar::updateTextures()
// Spam if this is a baked texture, not set to default image, without valid host info
if (isIndexBakedTexture((ETextureIndex)texture_index)
&& imagep->getID() != IMG_DEFAULT_AVATAR
+ && imagep->getID() != IMG_INVISIBLE
&& !imagep->getTargetHost().isOk())
{
LL_WARNS_ONCE("Texture") << "LLVOAvatar::updateTextures No host for texture "