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

Allow adding of multiple avatars to contact sets from radar, people panel and voice participant list

master
Ansariel 2014-02-10 10:50:23 +01:00
parent a011626b89
commit edc2a47b01
7 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/fsparticipantlist.cpp
View File

@ -1033,7 +1033,7 @@ bool LLParticipantList::LLParticipantListMenu::checkContextMenuItem(const LLSD&
void LLParticipantList::LLParticipantListMenu::handleAddToContactSet()
{
LLAvatarActions::addToContactSet(mUUIDs.front());
LLAvatarActions::addToContactSet(mUUIDs);
}
bool LLParticipantList::LLAvatarItemRecentSpeakerComparator::doCompare(const LLAvatarListItem* avatar_item1, const LLAvatarListItem* avatar_item2) const

3
indra/newview/fsradarmenu.cpp
View File

@ -118,6 +118,7 @@ LLContextMenu* FSRadarMenu::createMenu()
registrar.add("Avatar.EstateBan", boost::bind(&LLAvatarActions::estateBanMultiple, mUUIDs));
registrar.add("Avatar.Derender", boost::bind(&LLAvatarActions::derenderMultiple, mUUIDs, false));
registrar.add("Avatar.DerenderPermanent", boost::bind(&LLAvatarActions::derenderMultiple, mUUIDs, true));
registrar.add("Avatar.AddToContactSet", boost::bind(&FSRadarMenu::addToContactSet, this));
enable_registrar.add("Avatar.EnableItem", boost::bind(&FSRadarMenu::enableContextMenuItem, this, _2));
enable_registrar.add("Avatar.VisibleFreezeEject", boost::bind(&LLAvatarActions::canLandFreezeOrEjectMultiple, mUUIDs, false));
@ -257,6 +258,6 @@ void FSRadarMenu::onTrackAvatarMenuItemClick()
void FSRadarMenu::addToContactSet()
{
LLAvatarActions::addToContactSet(mUUIDs.front());
LLAvatarActions::addToContactSet(mUUIDs);
}
} // namespace FSFloaterRadarMenu

7
indra/newview/llpanelpeoplemenus.cpp
View File

@ -105,7 +105,8 @@ LLContextMenu* PeopleContextMenu::createMenu()
registrar.add("Avatar.RemoveFriend", boost::bind(&LLAvatarActions::removeFriendsDialog, mUUIDs));
// registrar.add("Avatar.Share", boost::bind(&LLAvatarActions::startIM, mUUIDs)); // *TODO: unimplemented
// registrar.add("Avatar.Pay", boost::bind(&LLAvatarActions::pay, mUUIDs)); // *TODO: unimplemented
registrar.add("Avatar.AddToContactSet", boost::bind(&PeopleContextMenu::addToContactSet, this)); // <FS:Ansariel>
enable_registrar.add("Avatar.EnableItem", boost::bind(&PeopleContextMenu::enableContextMenuItem, this, _2));
// create the context menu from the XUI
@ -130,6 +131,8 @@ void PeopleContextMenu::buildContextMenu(class LLMenuGL& menu, U32 flags)
items.push_back(std::string("share"));
items.push_back(std::string("pay"));
items.push_back(std::string("offer_teleport"));
items.push_back(std::string("Add to Set")); // <FS:Ansariel> Contact sets
}
else
{
@ -292,7 +295,7 @@ void PeopleContextMenu::offerTeleport()
// <FS:Ansariel> Add to contact set
void PeopleContextMenu::addToContactSet()
{
LLAvatarActions::addToContactSet(mUUIDs.front());
LLAvatarActions::addToContactSet(mUUIDs);
}
// </FS:Ansariel>

1
indra/newview/skins/default/xui/de/menu_fs_radar_multiselect.xml
View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<context_menu name="Multi-Selected People Context Menu">
<menu_item_call label="Freunde hinzufügen" name="Add Friends"/>
<menu_item_call label="Zu Kontakt-Set hinzufügen..." name="Add to Set"/>
<menu_item_call label="Freunde entfernen" name="Remove Friend"/>
<menu_item_call label="IM" name="IM"/>
<menu_item_call label="Anrufen" name="Call"/>

1
indra/newview/skins/default/xui/de/menu_people_nearby_multiselect.xml
View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<context_menu name="Multi-Selected People Context Menu">
<menu_item_call label="Freunde hinzufügen" name="add_friends"/>
<menu_item_call label="Zu Kontakt-Set hinzufügen..." name="Add to Set"/>
<menu_item_call label="Freunde entfernen" name="remove_friends"/>
<menu_item_call label="IM" name="im"/>
<menu_item_call label="Anrufen" name="call"/>

7
indra/newview/skins/default/xui/en/menu_fs_radar_multiselect.xml
View File

@ -13,6 +13,13 @@
function="Avatar.EnableItem"
parameter="can_add" />
</menu_item_call>
<menu_item_call
label="Add to Set"
layout="topleft"
name="Add to Set">
<menu_item_call.on_click
function="Avatar.AddToContactSet" />
</menu_item_call>
<menu_item_call
label="Remove Friends"
layout="topleft"

7
indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml
View File

@ -13,6 +13,13 @@
function="Avatar.EnableItem"
parameter="can_add" />
</menu_item_call>
<menu_item_call
label="Add to Set..."
layout="topleft"
name="Add to Set">
<menu_item_call.on_click
function="Avatar.AddToContactSet" />
</menu_item_call>
<menu_item_call
label="Remove Friends"
layout="topleft"