From 72d790c9499d5f2cd623693784363ca37bcab955 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Mon, 8 Sep 2014 10:31:24 +0200
Subject: [PATCH] FIRE-7337: Add "Zoom in" option in nearby voice options

---
 indra/newview/fsparticipantlist.cpp                    |  5 +++++
 .../skins/default/xui/de/menu_participant_list.xml     |  1 +
 .../skins/default/xui/en/menu_participant_list.xml     | 10 ++++++++++
 3 files changed, 16 insertions(+)

diff --git a/indra/newview/fsparticipantlist.cpp b/indra/newview/fsparticipantlist.cpp
index 2383efbcf2..bdfeb99729 100644
--- a/indra/newview/fsparticipantlist.cpp
+++ b/indra/newview/fsparticipantlist.cpp
@@ -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;
 }
diff --git a/indra/newview/skins/default/xui/de/menu_participant_list.xml b/indra/newview/skins/default/xui/de/menu_participant_list.xml
index 3b64f82f7e..12c88b3045 100755
--- a/indra/newview/skins/default/xui/de/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/de/menu_participant_list.xml
@@ -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"/>
diff --git a/indra/newview/skins/default/xui/en/menu_participant_list.xml b/indra/newview/skins/default/xui/en/menu_participant_list.xml
index 8f7c4b379e..99ca0f0e14 100755
--- a/indra/newview/skins/default/xui/en/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/en/menu_participant_list.xml
@@ -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" />