2 files changed, 8 insertions, 0 deletions

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 3ae02e7..2cb46b7 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
@@ -95,4 +95,7 @@
   <string name="muted">
     (muted)
   </string>
+  <string name="entering_chat_range">
+    [NAME] has entered chat range ([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 bb1c5ee..56bdb28 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,6 +77,11 @@
              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"
+             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"
+             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"