diff options
| author | simon <none@none> | 2013-10-23 14:14:36 -0700 |
|---|---|---|
| committer | simon <none@none> | 2013-10-23 14:14:36 -0700 |
| commit | 64c5afa196d1692cd0823ccd555f1f7bb32f529d (patch) | |
| tree | c0ee113ee6aae7009446756f4c10188134ea7179 /indra/newview/llparticipantlist.cpp | |
| parent | 0d0a8d841cab3fbb569a7382b78b0b4fb485eefb (diff) | |
| parent | ea1e1b0925b386cf83178539b8eae9e25c573548 (diff) | |
Merge latest viewer-release with FBC
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); |