livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

made a separate button to add test users to the folder view list. Also when receiving facebook friends both the avatarlist and folderview will be populated.

meow-7.2.2
Gilbert Gonzales 2013-04-16 22:36:32 -07:00
parent 9d615bbb44
commit 0eb2248f55
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
indra/newview/llpanelpeople.cpp
View File

@ -567,7 +567,7 @@ LLPanelPeople::LLPanelPeople()
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.testaddFBCFolderView", boost::bind(&LLPanelPeople::addTestParticipant, this));
mCommitCallbackRegistrar.add("People.AddFriend", boost::bind(&LLPanelPeople::onAddFriendButtonClicked, this));
mCommitCallbackRegistrar.add("People.AddFriendWizard", boost::bind(&LLPanelPeople::onAddFriendWizButtonClicked, this));
@ -1670,9 +1670,6 @@ bool LLPanelPeople::onConversationModelEvent(const LLSD& event)
LLConversationViewParticipant * participant_view = createConversationViewParticipant(participant_model);
participant_view->addToFolder(session_view);
}
llinfos << "adding!!!!!!" << llendl;
}
return false;
@ -1717,7 +1714,15 @@ void LLPanelPeople::showFacebookFriends(const LLSD& friends)
std::string name = i->second["name"].asString();
LLUUID agent_id = i->second.has("agent_id") ? i->second["agent_id"].asUUID() : LLUUID(NULL);
//add to avatar list
mFacebookFriends->addNewItem(agent_id, name, false);
//Add to folder view
LLConversationItemSession * session_model = dynamic_cast<LLConversationItemSession *>(mConversationsItems[LLUUID(NULL)]);
if(session_model)
{
addParticipantToModel(session_model, agent_id, name);
}
}
}

9
indra/newview/skins/default/xui/en/menu_gear_fbc.xml
View File

@ -28,10 +28,17 @@
parameter="http://www.facebook.com/settings?tab=applications" />
</menu_item_check>
<menu_item_check
label="Facebook Add 300 test users"
label="Facebook Add 300 test users to AvatarList"
layout="topleft"
name="Facebook App Add">
<menu_item_check.on_click
function="People.testaddFBC"/>
</menu_item_check>
<menu_item_check
label="Facebook Add 300 test users to FolderView"
layout="topleft"
name="Facebook App Add">
<menu_item_check.on_click
function="People.testaddFBCFolderView"/>
</menu_item_check>
</toggleable_menu>