From 64d298ac17b47805f3deec99fc911bd8f73a9d2d Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Thu, 8 Oct 2009 02:01:55 -0700
Subject: Mini-map radar now can notify you when someone enters the sim

---
 .../skins/default/xui/en-us/floater_mini_map.xml        |  3 +++
 .../default/xui/en-us/panel_preferences_general.xml     | 17 ++++++++++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)

(limited to 'linden/indra/newview/skins/default/xui/en-us')

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml b/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
index dd9c324..3baec3f 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
@@ -101,4 +101,7 @@
   <string name="entering_chat_range">
     [NAME] has entered chat range ([DISTANCE]m)
   </string>
+  <string name="entering_sim_range">
+    [NAME] has entered the sim ([DISTANCE]m)
+  </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
index 56bdb28..0c18a62 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
@@ -77,11 +77,22 @@
 	     follows="left|top" height="16" increment="1" initial_val="300"
 	     label="Away Timeout:" label_width="141" left="10" max_val="600"
 	     min_val="30" mouse_opaque="true" name="afk_timeout_spinner" width="202" />
-  <check_box bottom_delta="-25" enabled="true"
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+     bottom_delta="-25" drop_shadow_visible="true" enabled="true" follows="left|top"
+     font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
+     mouse_opaque="true" name="UI Size:" v_pad="0" width="128">
+    Mini-map notify:
+  </text>
+  <check_box bottom_delta="0" enabled="true"
 	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-	     label="Display mini-map messages in chat" left="151"
-	     mouse_opaque="true" name="mini_map_notify" radio_style="false"
+	     label="Entering chat range" left="151"
+	     mouse_opaque="true" name="mini_map_notify_chat" radio_style="false"
 	     width="256" />
+  <check_box bottom_delta="0" enabled="true"
+     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+     label="Entering sim" left="330"
+     mouse_opaque="true" name="mini_map_notify_sim" radio_style="false"
+     width="256" />
 	<check_box bottom="-304" enabled="true"
 	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
 	     label="Notify when Linden dollars (L$) spent or received" left="151"
-- 
cgit v1.1