diff options
author | Mike Antipov <mantipov@productengine.com> | 2010-04-01 12:28:08 +0300 |
---|---|---|
committer | Mike Antipov <mantipov@productengine.com> | 2010-04-01 12:28:08 +0300 |
commit | 25976eb3da84cfa23ec6db779f830971ce8665e3 (patch) | |
tree | 2975019de434ebe9fc4f4ffbd92d56a21b3d8bf1 /indra/newview/llviewermessage.cpp | |
parent | 7f38ea147466b6d045c90d710402b2ac321dbfd9 (diff) | |
parent | 68870a1f59c11a173353698b994f4540b214d57f (diff) |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
-rw-r--r-- | indra/newview/llviewermessage.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 305831aee3..53beced1d3 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -4028,7 +4028,7 @@ void process_avatar_animation(LLMessageSystem *mesgsys, void **user_data) //clear animation flags avatarp = (LLVOAvatar *)gObjectList.findObject(uuid); - if (!isAgentAvatarValid()) + if (!avatarp) { // no agent by this ID...error? LL_WARNS("Messaging") << "Received animation state for unknown avatar" << uuid << LL_ENDL; |