diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-11-18 16:07:55 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-11-18 16:07:55 -0800 |
| commit | ce5baf14ac62ecd3bf471e1b49a4e166310ebe1a (patch) | |
| tree | 110869149fbc439487bb7ae0c49c24b938570b09 /indra/newview/llparticipantlist.cpp | |
| parent | 125f3f071a30f4c47feb664b21f3e380ee4e7e49 (diff) | |
| parent | ebc9bcbf69f7a519677a6522979a6bf6cbb04bb8 (diff) | |
Pull merge from lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llparticipantlist.cpp')
| -rwxr-xr-x | indra/newview/llparticipantlist.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llparticipantlist.cpp b/indra/newview/llparticipantlist.cpp index c53760bca1..ee6893907e 100755 --- a/indra/newview/llparticipantlist.cpp +++ b/indra/newview/llparticipantlist.cpp @@ -27,6 +27,7 @@ #include "llviewerprecompiledheaders.h" #include "llavatarnamecache.h" +#include "llerror.h" #include "llimview.h" #include "llfloaterimcontainer.h" #include "llparticipantlist.h" @@ -401,6 +402,8 @@ void LLParticipantList::addAvatarIDExceptAgent(const LLUUID& avatar_id) adjustParticipant(avatar_id); } +static LLFastTimer::DeclareTimer FTM_FOLDERVIEW_TEST("add test avatar agents"); + void LLParticipantList::adjustParticipant(const LLUUID& speaker_id) { LLPointer<LLSpeaker> speakerp = mSpeakerMgr->findSpeaker(speaker_id); |