From 4055af4afdeac723a6299c4481f3d8bebe781a3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Liru=20F=C3=A6rs?= <lirusaito@gmail.com>
Date: Wed, 8 Jan 2020 15:23:51 -0500
Subject: [PATCH] Add Mark menu to radar

---
 indra/newview/llnetmap.cpp                    |  5 ++---
 .../skins/default/xui/en-us/menu_radar.xml    | 21 +++++++++++++++++++
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/indra/newview/llnetmap.cpp b/indra/newview/llnetmap.cpp
index a47757e0a..267967ebe 100644
--- a/indra/newview/llnetmap.cpp
+++ b/indra/newview/llnetmap.cpp
@@ -1498,9 +1498,8 @@ bool LLScaleMap::handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 //moymod - minimap color shit
 void markMassAgents(const LLColor4& color)
 {
-	auto self = LFIDBearer::getActive<LLNetMap>();
-	for (const auto& id : self->getSelectedIDs())
-		self->mm_setcolor(id, color);
+	for (const auto& id : LFIDBearer::getActiveSelectedIDs())
+		LLNetMap::mm_setcolor(id, color);
 }
 
 bool mmsetred::handleEvent(LLPointer<LLEvent>, const LLSD&)
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 612b8a7d4..c104d05e3 100644
--- a/indra/newview/skins/default/xui/en-us/menu_radar.xml
+++ b/indra/newview/skins/default/xui/en-us/menu_radar.xml
@@ -114,6 +114,27 @@
       <on_click function="Radar.FocusPrev" userdata="1"/>
     </menu_item_call>
   </menu>
+  <menu name="Mark" label="Mark">
+    <menu_item_call label="Red" name="Red">
+      <on_click function="MiniMap.setred" />
+    </menu_item_call>
+    <menu_item_call label="Green" name="Green">
+      <on_click function="MiniMap.setgreen" />
+    </menu_item_call>
+    <menu_item_call label="Blue" name="Blue">
+      <on_click function="MiniMap.setblue" />
+    </menu_item_call>
+    <menu_item_call label="Yellow" name="Yellow">
+      <on_click function="MiniMap.setyellow" />
+    </menu_item_call>
+    <menu_item_call label="Custom..." name="Custom">
+      <on_click function="MiniMap.setcustom" />
+    </menu_item_call>
+    <menu_item_call label="Unmark" name="Unmark">
+      <on_click function="MiniMap.setunmark" />
+      <on_enable function="MiniMap.enableunmark" />
+    </menu_item_call>
+  </menu>
   <menu label="Alerts" name="Alerts" create_jump_keys="true">
     <menu_item_check label="Display alerts when an avatar" name="Display alerts in chat">
       <on_click function="ToggleControl" userdata="RadarChatAlerts"/>