merge

1 files changed, 0 insertions, 142 deletions

diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml
deleted file mode 100644
index c4e4b9aa9b..0000000000
--- a/indra/newview/skins/default/xui/en/panel_places.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
-background_visible="true"
- follows="all"
- height="570"
- label="Places"
- layout="topleft"
- min_height="350"
- name="places panel"
- top="0"
- left="0"
- width="333">
-    <string
-     name="landmarks_tab_title"
-     value="MY LANDMARKS" />
-    <string
-     name="teleport_history_tab_title"
-     value="TELEPORT HISTORY" />
-    <filter_editor
-     text_pad_left="14"
-     follows="left|top|right"
-     font="SansSerifSmall"
-     height="23"
-     layout="topleft"
-     left="15"
-     label="Filter My Places"
-     max_length="300"
-     name="Filter"
-     top="3"
-     width="303" />
-    <tab_container
-     follows="all"
-     halign="center"
-     height="500"
-     layout="topleft"
-     left="10"
-     name="Places Tabs"
-     tab_min_width="80"
-     tab_height="30"
-     tab_position="top"
-     top_pad="10"
-     width="313" />
-    <panel
-     class="panel_place_profile"
-     filename="panel_place_profile.xml"
-     follows="all"
-     height="533"
-     layout="topleft"
-     left="0"
-     help_topic="place_profile"
-     name="panel_place_profile"
-     top="5"
-     visible="false"
-     width="313" />
-    <panel
-     class="panel_landmark_info"
-     filename="panel_landmark_info.xml"
-     follows="all"
-     height="533"
-     layout="topleft"
-     left="0"
-     help_topic="landmark"
-     name="panel_landmark_info"
-     top="5"
-     visible="false"
-     width="313" />
-    <panel
-     height="19"
-     layout="topleft"
-     left="0"
-     name="button_panel"
-     width="313">
-        <button
-         follows="bottom|left"
-         height="23"
-         label="Teleport"
-         layout="topleft"
-         left="5"
-         name="teleport_btn"
-         tool_tip="Teleport to the selected area"
-         top="0"
-         width="100" />
-        <button
-         follows="bottom|left"
-         height="23"
-         label="Map"
-         layout="topleft"
-         left_pad="5"
-         name="map_btn"
-         top="0"
-         width="70" />
-        <button
-         follows="bottom|left"
-         height="23"
-         label="Edit"
-         layout="topleft"
-         left_pad="5"
-         name="edit_btn"
-         tool_tip="Edit landmark information"
-         top="0"
-         width="70" />
-        <button
-         follows="bottom|right"
-         height="23"
-         image_disabled="ForwardArrow_Off"
-         image_selected="ForwardArrow_Press"
-         image_unselected="ForwardArrow_Off"
-         layout="topleft"
-         name="overflow_btn"
-         tool_tip="Show additional options"
-         right="-10"
-         top="0"
-         width="18" />
-        <button
-         follows="bottom|right"
-         height="23"
-         label="Close"
-         layout="topleft"
-         name="close_btn"
-         right="-10"
-         top="0"
-         width="60" />
-        <button
-         follows="bottom|right"
-         height="23"
-         label="Cancel"
-         layout="topleft"
-         name="cancel_btn"
-         right="-10"
-         top="0"
-         width="60" />
-        <button
-         follows="bottom|right"
-         height="23"
-         label="Save"
-         layout="topleft"
-         name="save_btn"
-         right="-75"
-         top="0"
-         width="60" />
-    </panel>
-</panel>