From 28fc276153b52fdf233ecbf46625e145a3575fbc Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Fri, 1 Nov 2013 15:08:07 +0100
Subject: [PATCH] Wire up teleport request feature in Firestorm radar

---
 indra/newview/fsradarmenu.cpp                        | 1 +
 indra/newview/skins/default/xui/en/menu_fs_radar.xml | 9 +++++++++
 indra/newview/skins/default/xui/en/notifications.xml | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/indra/newview/fsradarmenu.cpp b/indra/newview/fsradarmenu.cpp
index 02e014761a..e56ede42c4 100644
--- a/indra/newview/fsradarmenu.cpp
+++ b/indra/newview/fsradarmenu.cpp
@@ -66,6 +66,7 @@ LLContextMenu* FSRadarMenu::createMenu()
 		registrar.add("Avatar.IM",								boost::bind(&LLAvatarActions::startIM,						id));
 		registrar.add("Avatar.Call",							boost::bind(&LLAvatarActions::startCall,					id));
 		registrar.add("Avatar.OfferTeleport",					boost::bind(&FSRadarMenu::offerTeleport,					this));
+		registrar.add("Avatar.TeleportRequest",					boost::bind(&LLAvatarActions::teleportRequest,				id));
 		registrar.add("Avatar.GroupInvite",						boost::bind(&LLAvatarActions::inviteToGroup,				id));
 		registrar.add("Avatar.getScriptInfo",					boost::bind(&LLAvatarActions::getScriptInfo,				id));
 		registrar.add("Avatar.ShowOnMap",						boost::bind(&LLAvatarActions::showOnMap,					id));
diff --git a/indra/newview/skins/default/xui/en/menu_fs_radar.xml b/indra/newview/skins/default/xui/en/menu_fs_radar.xml
index dbd31e585d..eecd03d31c 100644
--- a/indra/newview/skins/default/xui/en/menu_fs_radar.xml
+++ b/indra/newview/skins/default/xui/en/menu_fs_radar.xml
@@ -90,6 +90,15 @@
        parameter="can_offer_teleport"/>
     </menu_item_call>
     <menu_item_call
+    label="Request Teleport"
+    name="request_teleport">
+      <menu_item_call.on_click
+       function="Avatar.TeleportRequest"/>
+      <menu_item_call.on_enable
+      function="Avatar.EnableItem"
+      parameter="can_offer_teleport"/>
+    </menu_item_call>
+    <menu_item_call
     label="Teleport To"
     name="teleport_to">
       <menu_item_call.on_click
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index cad421fff0..37106b043e 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -7127,7 +7127,7 @@ Joining this group costs a fee and the invitation cannot be accepted because of
    sound="UISndTeleportOffer">
 [NAME_SLURL] has offered to teleport you to their location:
 
-"[MESSAGE]”
+“[MESSAGE]”
 &lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
     <tag>confirm</tag>
     <form name="form">