diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-02-11 09:49:57 +0200 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-02-11 09:49:57 +0200 |
| commit | b0af6b8acb33c86e5ac8d693131b5c9e7d9407b5 (patch) | |
| tree | dbe58da2c0ff07a8950548a513db31806f0308d4 /indra/newview/llvoavatar.cpp | |
| parent | d3bde04a8c3a2cd142bb75dbcad577d083aad0d1 (diff) | |
| parent | abae31cb4a26500012663cdc2a06a290ac4e46c9 (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 4235f97eab..cf0808ea5b 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -3079,7 +3079,7 @@ BOOL LLVOAvatar::updateCharacter(LLAgent &agent) if (!visible) { - //updateMotions(LLCharacter::HIDDEN_UPDATE); + updateMotions(LLCharacter::HIDDEN_UPDATE); return FALSE; } @@ -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 " |