From 828342271755bad62c02736182595b79fd2d30f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Liru=20F=C3=A6rs?= <lirusaito@gmail.com>
Date: Tue, 7 Jan 2020 11:53:23 -0500
Subject: [PATCH] Rename Radar.TeleportTo to List.TeleportTo, and move the code

---
 indra/newview/llfloateravatarlist.cpp                | 10 ----------
 indra/newview/llviewermenu.cpp                       | 12 +++++++++++-
 .../skins/default/xui/en-us/menu_avs_list.xml        |  2 +-
 .../skins/default/xui/en-us/menu_local_avs.xml       |  2 +-
 indra/newview/skins/default/xui/en-us/menu_radar.xml |  2 +-
 .../skins/default/xui/en-us/menu_url_agent.xml       |  2 +-
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/indra/newview/llfloateravatarlist.cpp b/indra/newview/llfloateravatarlist.cpp
index 5517d7df0..5d1991e04 100644
--- a/indra/newview/llfloateravatarlist.cpp
+++ b/indra/newview/llfloateravatarlist.cpp
@@ -400,15 +400,6 @@ namespace
 		}
 	};
 
-	class RadarTeleportTo : public view_listener_t
-	{
-		bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-		{
-			gAgent.teleportViaLocation(get_av_pos(LFIDBearer::getActiveSelectedID()));
-			return true;
-		}
-	};
-
 	class RadarAnnounceKeys : public view_listener_t
 	{
 		bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -428,7 +419,6 @@ void add_radar_listeners()
 	addMenu(new RadarFocus, "Radar.Focus");
 	addMenu(new RadarFocusPrev, "Radar.FocusPrev");
 	addMenu(new RadarFocusNext, "Radar.FocusNext");
-	addMenu(new RadarTeleportTo, "Radar.TeleportTo");
 	addMenu(new RadarAnnounceKeys, "Radar.AnnounceKeys");
 }
 
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index bdda724e8..99b2a328e 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -9352,6 +9352,16 @@ class ListStartIM : public view_listener_t
 	}
 };
 
+const LLVector3d& get_av_pos(const LLUUID& id);
+class ListTeleportTo : public view_listener_t
+{
+	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+	{
+		gAgent.teleportViaLocation(get_av_pos(LFIDBearer::getActiveSelectedID()));
+		return true;
+	}
+};
+
 class ListAbuseReport : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -9389,7 +9399,6 @@ class ListIsNearby : public view_listener_t
 	}
 };
 
-const LLVector3d& get_av_pos(const LLUUID& id);
 class ListGoTo : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -9931,6 +9940,7 @@ void initialize_menus()
 	addMenu(new ListStartCall(), "List.StartCall");
 	addMenu(new ListStartConference(), "List.StartConference");
 	addMenu(new ListStartIM(), "List.StartIM");
+	addMenu(new ListTeleportTo, "List.TeleportTo");
 	addMenu(new ListAbuseReport(), "List.AbuseReport");
 	addMenu(new ListIsNearby, "List.IsNearby");
 	addMenu(new ListGoTo, "List.GoTo");
diff --git a/indra/newview/skins/default/xui/en-us/menu_avs_list.xml b/indra/newview/skins/default/xui/en-us/menu_avs_list.xml
index 9633ff50a..f66829859 100644
--- a/indra/newview/skins/default/xui/en-us/menu_avs_list.xml
+++ b/indra/newview/skins/default/xui/en-us/menu_avs_list.xml
@@ -55,7 +55,7 @@
       <on_enable function="List.EnableAnySelected"/>
     </menu_item_call>
     <menu_item_call label="Teleport To" name="Teleport To">
-      <on_click function="Radar.TeleportTo"/>
+      <on_click function="List.TeleportTo"/>
       <on_enable function="List.EnableSingleSelected"/>
       <on_visible function="List.IsNearby"/>
     </menu_item_call>
diff --git a/indra/newview/skins/default/xui/en-us/menu_local_avs.xml b/indra/newview/skins/default/xui/en-us/menu_local_avs.xml
index 35ac2ff18..2f3d07b9b 100644
--- a/indra/newview/skins/default/xui/en-us/menu_local_avs.xml
+++ b/indra/newview/skins/default/xui/en-us/menu_local_avs.xml
@@ -54,7 +54,7 @@
       <on_enable function="List.EnableAnySelected"/>
     </menu_item_call>
     <menu_item_call label="Teleport To" name="Teleport To">
-      <on_click function="Radar.TeleportTo"/>
+      <on_click function="List.TeleportTo"/>
       <on_enable function="List.EnableSingleSelected"/>
     </menu_item_call>
     <menu_item_call label="Request Teleport" name="Request Teleport">
diff --git a/indra/newview/skins/default/xui/en-us/menu_radar.xml b/indra/newview/skins/default/xui/en-us/menu_radar.xml
index c536afb7c..2e2558982 100644
--- a/indra/newview/skins/default/xui/en-us/menu_radar.xml
+++ b/indra/newview/skins/default/xui/en-us/menu_radar.xml
@@ -55,7 +55,7 @@
       <on_enable function="List.EnableAnySelected"/>
     </menu_item_call>
     <menu_item_call label="Teleport To" name="Teleport To" shortcut="control|Enter">
-      <on_click function="Radar.TeleportTo"/>
+      <on_click function="List.TeleportTo"/>
       <on_enable function="List.EnableSingleSelected"/>
     </menu_item_call>
     <menu_item_call label="Request Teleport" name="Request Teleport">
diff --git a/indra/newview/skins/default/xui/en-us/menu_url_agent.xml b/indra/newview/skins/default/xui/en-us/menu_url_agent.xml
index 493c5ef1f..6fd1d5f10 100644
--- a/indra/newview/skins/default/xui/en-us/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/en-us/menu_url_agent.xml
@@ -42,7 +42,7 @@
       <on_click function="List.OfferTeleport"/>
     </menu_item_call>
     <menu_item_call label="Teleport To" name="Teleport To">
-      <on_click function="Radar.TeleportTo"/>
+      <on_click function="List.TeleportTo"/>
       <on_visible function="List.IsNearby"/>
     </menu_item_call>
     <menu_item_call label="Request Teleport" name="Request Teleport">