merge

1 files changed, 0 insertions, 109 deletions

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
deleted file mode 100644
index 188fd3b7bc..0000000000
--- a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- border="true"
- height="408"
- label="Popups"
- layout="topleft"
- left="0"
- name="popups"
- top="500"
- width="517">
-    <text
-     type="string"
-     length="1"
-     follows="top|left"
-     height="12"
-     layout="topleft"
-     left="10"
-     name="tell_me_label"
-     top="10"
-     width="300">
-        Tell me:
-    </text>
-    <check_box
-     control_name="NotifyMoneyChange"
-     height="16"
-     label="When I spend or get L$"
-     layout="topleft"
-     left_delta="50"
-     name="notify_money_change_checkbox"
-     top_pad="4"
-     width="300" />
-    <check_box
-     control_name="ChatOnlineNotification"
-     height="16"
-     label="When my friends log in or out"
-     layout="topleft"
-     left_delta="0"
-     name="friends_online_notify_checkbox"
-     top_pad="4"
-     width="300" />
-    <text
-     type="string"
-     length="1"
-     follows="top|left"
-     height="12"
-     layout="topleft"
-     left="10"
-     name="show_label"
-     top_pad="8"
-     width="450">
-        Always show:
-    </text>
-    <scroll_list
-     follows="top|left"
-     height="140"
-     layout="topleft"
-     left="10"
-     multi_select="true"
-     name="enabled_popups"
-     width="475" />
-	 <button
-	 enabled_control="FirstSelectedDisabledPopups"
-     follows="top|left"
-     height="23"
-     image_overlay="Arrow_Up"
-     hover_glow_amount="0.15"
-     layout="topleft"
-     left="180"
-     name="enable_this_popup"
-     top_pad="5"
-     width="40">
-        <button.commit_callback
-         function="Pref.ClickEnablePopup" />
-    </button>
-    <button
-	 enabled_control="FirstSelectedEnabledPopups"
-	 follows="top|left"
-     height="23"
-     image_overlay="Arrow_Down"
-     hover_glow_amount="0.15"
-     layout="topleft"
-     left_pad="40"
-     name="disable_this_popup"
-     top_delta="0"
-     width="40">
-        <button.commit_callback
-         function="Pref.ClickDisablePopup" />
-    </button>
-    <text
-     type="string"
-     length="1"
-     follows="top|left"
-     height="12"
-     layout="topleft"
-     left="10"
-     name="dont_show_label"
-     top_pad="-10"
-     width="450">
-        Never show:
-    </text>
-    <scroll_list
-     follows="top|left"
-     height="140"
-     layout="topleft"
-     left="10"
-     multi_select="true"
-     name="disabled_popups"
-     width="475" />
-</panel>