adding in logging of building a list of 300 users inside LLAvatarList and LLFolderView to determine drawbacks/benefits and timing.

meow-7.2.2
Gilbert Gonzales 2013-04-09 13:24:51 -07:00
parent 2b8632a81b
commit 479c5f4b4a
6 changed files with 46 additions and 3 deletions

View File

@ -342,8 +342,11 @@ void LLFloaterIMContainer::onStubCollapseButtonClicked()
void LLFloaterIMContainer::onSpeakButtonClicked()
{
LLAgent::toggleMicrophone("speak");
updateSpeakBtnState();
//LLAgent::toggleMicrophone("speak");
//updateSpeakBtnState();
LLParticipantList* session_model = dynamic_cast<LLParticipantList*>(mConversationsItems[LLUUID(NULL)]);
session_model->addTestAvatarAgents();
}
void LLFloaterIMContainer::onExpandCollapseButtonClicked()
{

View File

@ -49,6 +49,7 @@
#include "llavatarlist.h"
#include "llavatarlistitem.h"
#include "llcallingcard.h" // for LLAvatarTracker
#include "llerror.h"
#include "llfloateravatarpicker.h"
//#include "llfloaterminiinspector.h"
#include "llfriendcard.h"
@ -557,6 +558,7 @@ LLPanelPeople::LLPanelPeople()
mCommitCallbackRegistrar.add("People.loginFBC", boost::bind(&LLPanelPeople::onLoginFbcButtonClicked, this));
mCommitCallbackRegistrar.add("People.requestFBC", boost::bind(&LLPanelPeople::onFacebookAppRequestClicked, this));
mCommitCallbackRegistrar.add("People.sendFBC", boost::bind(&LLPanelPeople::onFacebookAppSendClicked, this));
mCommitCallbackRegistrar.add("People.testaddFBC", boost::bind(&LLPanelPeople::onFacebookTestAddClicked, this));
mCommitCallbackRegistrar.add("People.AddFriend", boost::bind(&LLPanelPeople::onAddFriendButtonClicked, this));
@ -1789,4 +1791,19 @@ void LLPanelPeople::onFacebookAppSendClicked()
p.url("https://www.facebook.com/dialog/send?app_id=565771023434202&name=Join Second Life!&link=https://join.secondlife.com&redirect_uri=" + FBC_SERVICES_URL);
openFacebookWeb(p);
}
void LLPanelPeople::onFacebookTestAddClicked()
{
mFacebookFriends->clear();
LL_INFOS("LLPanelPeople") << "start adding 300 users" << LL_ENDL;
for(int i = 0; i < 300; ++i)
{
mFacebookFriends->addNewItem(LLUUID(), "Test", false);
}
LL_INFOS("LLPanelPeople") << "finished adding 300 users" << LL_ENDL;
}
// EOF

View File

@ -124,6 +124,7 @@ private:
void onLoginFbcButtonClicked();
void onFacebookAppRequestClicked();
void onFacebookAppSendClicked();
void onFacebookTestAddClicked();
bool onFriendsViewSortMenuItemCheck(const LLSD& userdata);
bool onRecentViewSortMenuItemCheck(const LLSD& userdata);

View File

@ -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,19 @@ void LLParticipantList::addAvatarIDExceptAgent(const LLUUID& avatar_id)
adjustParticipant(avatar_id);
}
void LLParticipantList::addTestAvatarAgents()
{
LL_INFOS("LLParticipantList") << "start adding 300 users" << LL_ENDL;
for(int i = 0; i < 300; ++i)
{
addAvatarIDExceptAgent(LLUUID().generateNewID());
}
LL_INFOS("LLParticipantList") << "finished adding 300 users" << LL_ENDL;
}
void LLParticipantList::adjustParticipant(const LLUUID& speaker_id)
{
LLPointer<LLSpeaker> speakerp = mSpeakerMgr->findSpeaker(speaker_id);

View File

@ -50,6 +50,7 @@ public:
* @param[in] avatar_id - Avatar UUID to be added into the list
*/
void addAvatarIDExceptAgent(const LLUUID& avatar_id);
void addTestAvatarAgents();
/**
* Refreshes the participant list.

View File

@ -26,5 +26,12 @@
<menu_item_check.on_click
function="People.sendFBC"
parameter="http://www.facebook.com/settings?tab=applications" />
</menu_item_check>
</menu_item_check>
<menu_item_check
label="Facebook Add 300 test users"
layout="topleft"
name="Facebook App Add">
<menu_item_check.on_click
function="People.testaddFBC"/>
</menu_item_check>
</toggleable_menu>