automated merge

1 files changed, 0 insertions, 170 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_map.xml b/indra/newview/skins/default/xui/en/floater_map.xml
deleted file mode 100644
index 1903e7c714..0000000000
--- a/indra/newview/skins/default/xui/en/floater_map.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- can_minimize="true" 
- can_resize="true"
- center_horiz="true"
- center_vert="true"
- follows="top|right"
- height="218"
- layout="topleft"
- min_height="60"
- min_width="174"
- name="Map"
- title="Mini Map"
- help_topic="map"
- save_rect="true"
- save_visibility="true"
- single_instance="true"
- width="200">
-    <floater.string
-     name="mini_map_north">
-        N
-    </floater.string>
-    <floater.string
-     name="mini_map_east">
-        E
-    </floater.string>
-    <floater.string
-     name="mini_map_west">
-        W
-    </floater.string>
-    <floater.string
-     name="mini_map_south">
-        S
-    </floater.string>
-    <floater.string
-     name="mini_map_southeast">
-        SE
-    </floater.string>
-    <floater.string
-     name="mini_map_northeast">
-        NE
-    </floater.string>
-    <floater.string
-     name="mini_map_southwest">
-        SW
-    </floater.string>
-    <floater.string
-     name="mini_map_northwest">
-        NW
-    </floater.string>
-    <floater.string
-     name="ToolTipMsg">
-        [AGENT][REGION](Double-click to open Map)
-    </floater.string>
-    <net_map
-     bg_color="NetMapBackgroundColor"
-     follows="top|left|bottom|right"
-     layout="topleft"
-     left="0"
-     mouse_opaque="false"
-     name="Net Map"
-     width="200"
-     height="200"
-     top="18"/>
-    <text
-     type="string"
-     length="1"
-     bottom="218"
-     label="N"
-     layout="topleft"
-     left="0"
-     name="floater_map_north"
-     right="10"
-     text_color="1 1 1 0.7"
-     top="209">
-        N
-    </text>
-    <text
-     type="string"
-     length="1"
-     bottom="218"
-     label="E"
-     layout="topleft"
-     left="0"
-     name="floater_map_east"
-     right="10"
-     text_color="1 1 1 0.7"
-     top="209">
-        E
-    </text>
-    <text
-     type="string"
-     length="1"
-     bottom="205"
-     label="W"
-     layout="topleft"
-     left="0"
-     name="floater_map_west"
-     right="11"
-     text_color="1 1 1 0.7"
-     top="195">
-        W
-    </text>
-    <text
-     type="string"
-     length="1"
-     bottom="218"
-     label="S"
-     layout="topleft"
-     left="0"
-     name="floater_map_south"
-     right="10"
-     text_color="1 1 1 0.7"
-     top="209">
-        S
-    </text>
-    <text
-     type="string"
-     length="1"
-     bottom="218"
-     label="SE"
-     layout="topleft"
-     left="0"
-     name="floater_map_southeast"
-     right="20"
-     text_color="1 1 1 0.7"
-     top="209">
-        SE
-    </text>
-    <text
-     type="string"
-     length="1"
-     bottom="218"
-     label="NE"
-     layout="topleft"
-     left="0"
-     name="floater_map_northeast"
-     right="20"
-     text_color="1 1 1 0.7"
-     top="209">
-        NE
-    </text>
-    <text
-     type="string"
-     length="1"
-     bottom="218"
-     label="SW"
-     layout="topleft"
-     left="0"
-     name="floater_map_southwest"
-     right="20"
-     text_color="1 1 1 0.7"
-     top="209">
-        SW
-    </text>
-    <text
-     type="string"
-     length="1"
-     bottom="218"
-     label="NW"
-     layout="topleft"
-     left="0"
-     name="floater_map_northwest"
-     right="20"
-     text_color="1 1 1 0.7"
-     top="209">
-        NW
-    </text>
-</floater>