From 44eaa10b80bfe46b0fdab147f3addb45f4720cfc Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Tue, 12 Nov 2013 14:51:43 +0200
Subject: MAINT-3068 FIXED "Request Teleport" menu item is added to context
 menu.

---
 indra/newview/llchathistory.cpp                         | 6 ++++++
 indra/newview/skins/default/xui/en/menu_avatar_icon.xml | 6 ++++++
 2 files changed, 12 insertions(+)

(limited to 'indra/newview')

diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp
index 69aeec3975..a145527368 100755
--- a/indra/newview/llchathistory.cpp
+++ b/indra/newview/llchathistory.cpp
@@ -187,6 +187,10 @@ public:
 		{
 			LLAvatarActions::offerTeleport(getAvatarId());
 		}
+		else if (level == "request_teleport")
+		{
+			LLAvatarActions::teleportRequest(getAvatarId());
+		}
 		else if (level == "voice_call")
 		{
 			LLAvatarActions::startCall(getAvatarId());
@@ -547,6 +551,7 @@ protected:
 				menu->setItemEnabled("Send IM", false);
 				menu->setItemEnabled("Remove Friend", false);
 				menu->setItemEnabled("Offer Teleport",false);
+				menu->setItemEnabled("Request Teleport",false);
 				menu->setItemEnabled("Voice Call", false);
 				menu->setItemEnabled("Chat History", false);
 				menu->setItemEnabled("Invite Group", false);
@@ -564,6 +569,7 @@ protected:
 					menu->setItemVisible("Send IM", false);
 				}
 				menu->setItemEnabled("Offer Teleport", LLAvatarActions::canOfferTeleport(mAvatarID));
+				menu->setItemEnabled("Request Teleport", LLAvatarActions::canOfferTeleport(mAvatarID));
 				menu->setItemEnabled("Voice Call", LLAvatarActions::canCall());
 
 				// We should only show 'Zoom in' item in a nearby chat
diff --git a/indra/newview/skins/default/xui/en/menu_avatar_icon.xml b/indra/newview/skins/default/xui/en/menu_avatar_icon.xml
index 77b9095f7c..410caa7290 100755
--- a/indra/newview/skins/default/xui/en/menu_avatar_icon.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_icon.xml
@@ -30,6 +30,12 @@
      name="Offer Teleport">
         <on_click function="AvatarIcon.Action" parameter="teleport"/>
     </menu_item_call>
+    <menu_item_call
+     label="Request Teleport"
+     layout="topleft"
+     name="Request Teleport">
+        <on_click function="AvatarIcon.Action" parameter="request_teleport"/>      
+    </menu_item_call>
     <menu_item_call
      label="Voice call"
      layout="topleft"
-- 
cgit v1.2.3