From 47044de069c2c1442a33d719846cdbf1e3450124 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Mon, 4 Jun 2012 11:23:38 -0400
Subject: STORM-1838 Add "Request Teleport" option to the menu when
 right-clicking on avatars in the Nearby list

---
 indra/newview/skins/default/xui/en/menu_people_nearby.xml | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'indra/newview/skins/default/xui/en/menu_people_nearby.xml')

diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby.xml b/indra/newview/skins/default/xui/en/menu_people_nearby.xml
index d2e35e4cc0..cff383cab1 100644
--- a/indra/newview/skins/default/xui/en/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_nearby.xml
@@ -70,6 +70,13 @@
         <menu_item_call.on_click
          function="Avatar.Pay" />
     </menu_item_call>
+    <menu_item_call
+     label="Request Teleport"
+     layout="topleft"
+     name="Request Teleport">
+        <menu_item_call.on_click
+         function="Avatar.RequestTeleport" />
+    </menu_item_call>
     <menu_item_check
      label="Block/Unblock"
      layout="topleft"
-- 
cgit v1.2.3


From e386aa73b7af5ca326f66fa3fb0482e42b3af33f Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Fri, 11 Jan 2013 11:13:44 -0500
Subject: STORM-1838

---
 indra/newview/skins/default/xui/en/menu_people_nearby.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/menu_people_nearby.xml')

diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby.xml b/indra/newview/skins/default/xui/en/menu_people_nearby.xml
index cff383cab1..951f43f325 100644
--- a/indra/newview/skins/default/xui/en/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_nearby.xml
@@ -75,7 +75,7 @@
      layout="topleft"
      name="Request Teleport">
         <menu_item_call.on_click
-         function="Avatar.RequestTeleport" />
+         function="Avatar.TeleportRequest" />
     </menu_item_call>
     <menu_item_check
      label="Block/Unblock"
-- 
cgit v1.2.3


From 3882945fb9cfbe2710b8f05c7bf8b8c079272191 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Sat, 26 Jan 2013 07:00:44 -0500
Subject: STORM-1838 Add code for right click menu on inventory calling cards.
 Add initial support to insert teleport request into existing IM window.

---
 .../newview/skins/default/xui/en/menu_people_nearby.xml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/menu_people_nearby.xml')

diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby.xml b/indra/newview/skins/default/xui/en/menu_people_nearby.xml
index 951f43f325..e7a27c39fa 100644
--- a/indra/newview/skins/default/xui/en/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_nearby.xml
@@ -70,13 +70,6 @@
         <menu_item_call.on_click
          function="Avatar.Pay" />
     </menu_item_call>
-    <menu_item_call
-     label="Request Teleport"
-     layout="topleft"
-     name="Request Teleport">
-        <menu_item_call.on_click
-         function="Avatar.TeleportRequest" />
-    </menu_item_call>
     <menu_item_check
      label="Block/Unblock"
      layout="topleft"
@@ -99,4 +92,14 @@
       function="Avatar.EnableItem"
       parameter="can_offer_teleport"/>
     </menu_item_call>
+    <menu_item_call
+     label="Request Teleport"
+     layout="topleft"
+     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>
 </context_menu>
-- 
cgit v1.2.3


From ec52db8d0c4099dd5e3b476f7b44a4ebda7cb676 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Wed, 5 Jun 2013 17:32:10 -0400
Subject: STORM-1838 Slowly reappling changes to work with CHUI

---
 indra/newview/skins/default/xui/en/menu_people_nearby.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'indra/newview/skins/default/xui/en/menu_people_nearby.xml')

diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby.xml b/indra/newview/skins/default/xui/en/menu_people_nearby.xml
index 25b100bc94..80e8e59076 100644
--- a/indra/newview/skins/default/xui/en/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_nearby.xml
@@ -28,6 +28,15 @@
       function="Avatar.EnableItem"
       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="Voice call"
      layout="topleft"
-- 
cgit v1.2.3


From d233d8836b610b5e5ca76a1e3bb4d63dc3592e66 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Thu, 6 Jun 2013 17:16:00 -0400
Subject: STORM-1838 Remove incorrect XML menu text

---
 indra/newview/skins/default/xui/en/menu_people_nearby.xml | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/menu_people_nearby.xml')

diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby.xml b/indra/newview/skins/default/xui/en/menu_people_nearby.xml
index 80e8e59076..f12226ebeb 100644
--- a/indra/newview/skins/default/xui/en/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_nearby.xml
@@ -143,15 +143,4 @@
          function="Avatar.EnableItem"
          parameter="can_block" />
     </menu_item_check>
-    <menu_item_separator />
-    <menu_item_call
-     label="Request Teleport"
-     layout="topleft"
-     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>
 </context_menu>
-- 
cgit v1.2.3