diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-03-31 16:11:21 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-03-31 16:11:21 -0400 |
| commit | e504f895135eec69d9ec5ee31cdefc2ced145631 (patch) | |
| tree | 63c3c5391cd0d16bd23938e3a486442e051e8976 /indra/newview/llviewermessage.cpp | |
| parent | 2208e6da2ca9b9e94f5aa903d98a0167baf15577 (diff) | |
| parent | fc8c4ea485f34ef52b2c3e037124795e5df9c064 (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 42c8b4ee64..5f8c03b545 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -63,6 +63,7 @@ #include "llfloaterpreference.h" #include "llhudeffecttrail.h" #include "llhudmanager.h" +#include "llinventoryfunctions.h" #include "llinventoryobserver.h" #include "llinventorypanel.h" #include "llnearbychat.h" @@ -4030,7 +4031,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; |