diff options
| author | Cho <cho@lindenlab.com> | 2013-04-13 02:11:43 +0100 |
|---|---|---|
| committer | Cho <cho@lindenlab.com> | 2013-04-13 02:11:43 +0100 |
| commit | 0c93e1746c91d06be61b16663482a5641be931e6 (patch) | |
| tree | 4a922b8ae9831d412af21e74dddaf3d28b2a2927 | |
| parent | 9a0cd53bdaf10652236f082a63fe43ec126a9251 (diff) | |
| parent | 46c690bd50c588f126d8b5dba67a6802d255c2bd (diff) | |
merge
| -rw-r--r-- | indra/newview/llpanelpeople.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llparticipantlist.cpp | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp index 5a4eca87ff..519868612a 100644 --- a/indra/newview/llpanelpeople.cpp +++ b/indra/newview/llpanelpeople.cpp @@ -1807,8 +1807,12 @@ void LLPanelPeople::onFacebookAppSendClicked() openFacebookWeb(p); } +static LLFastTimer::DeclareTimer FTM_AVATAR_LIST_TEST("avatar list test"); + void LLPanelPeople::onFacebookTestAddClicked() { + LLFastTimer _(FTM_AVATAR_LIST_TEST); + mFacebookFriends->clear(); LL_INFOS("LLPanelPeople") << "start adding 300 users" << LL_ENDL; diff --git a/indra/newview/llparticipantlist.cpp b/indra/newview/llparticipantlist.cpp index e05b27e539..b5c9f4a310 100644 --- a/indra/newview/llparticipantlist.cpp +++ b/indra/newview/llparticipantlist.cpp @@ -402,9 +402,13 @@ void LLParticipantList::addAvatarIDExceptAgent(const LLUUID& avatar_id) adjustParticipant(avatar_id); } +static LLFastTimer::DeclareTimer FTM_FOLDERVIEW_TEST("add test avatar agents"); + void LLParticipantList::addTestAvatarAgents() { + LLFastTimer _(FTM_FOLDERVIEW_TEST); + LL_INFOS("LLParticipantList") << "start adding 300 users" << LL_ENDL; for(int i = 0; i < 300; ++i) |