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

FIRE-7337: Add "Zoom in" option in nearby voice options

Ansariel 2014-09-08 10:31:24 +02:00
parent 1b2ec97abf
commit 72d790c949
3 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/fsparticipantlist.cpp
View File

@ -695,6 +695,7 @@ LLContextMenu* LLParticipantList::LLParticipantListMenu::createMenu()
registrar.add("Avatar.Pay", boost::bind(&LLAvatarActions::pay, mUUIDs.front()));
registrar.add("Avatar.Call", boost::bind(&LLAvatarActions::startCall, mUUIDs.front()));
registrar.add("Avatar.AddToContactSet", boost::bind(&LLParticipantList::LLParticipantListMenu::handleAddToContactSet, this));
registrar.add("Avatar.ZoomIn", boost::bind(&LLAvatarActions::zoomIn, mUUIDs.front()));
registrar.add("ParticipantList.ModerateVoice", boost::bind(&LLParticipantList::LLParticipantListMenu::moderateVoice, this, _2));
@ -963,6 +964,10 @@ bool LLParticipantList::LLParticipantListMenu::enableContextMenuItem(const LLSD&
return LLGroupActions::canEjectFromGroup(mParent.mSpeakerMgr->getSessionID(), mUUIDs.front());
}
// [/SL:KB]
else if (item == "can_zoom_in")
{
return LLAvatarActions::canZoomIn(mUUIDs.front());
}
return true;
}

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

@ -9,6 +9,7 @@
<menu_item_call label="Anrufen" name="Call"/>
<menu_item_call label="Teilen" name="Share"/>
<menu_item_call label="Bezahlen" name="Pay"/>
<menu_item_call label="Heranzoomen" name="zoom_in"/>
<menu_item_check label="Symbole für Personen anzeigen" name="View Icons"/>
<menu_item_check label="Voice ignorieren" name="Block/Unblock"/>
<menu_item_check label="Text ignorieren" name="MuteText"/>

10
indra/newview/skins/default/xui/en/menu_participant_list.xml
View File

@ -69,6 +69,16 @@
function="ParticipantList.EnableItem"
parameter="can_pay" />
</menu_item_call>
<menu_item_call
label="Zoom In"
layout="topleft"
name="zoom_in">
<menu_item_call.on_click
function="Avatar.ZoomIn" />
<menu_item_call.on_enable
function="ParticipantList.EnableItem"
parameter="can_zoom_in"/>
</menu_item_call>
<menu_item_separator
layout="topleft"
name="Sort Separator" />