remove author tracking, non-wordstyle option, and notifications

2 files changed, 1 insertions, 69 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_autoreplace.xml b/indra/newview/skins/default/xui/en/floater_autoreplace.xml
index 5f53e61fa2..f68aeacb97 100644
--- a/indra/newview/skins/default/xui/en/floater_autoreplace.xml
+++ b/indra/newview/skins/default/xui/en/floater_autoreplace.xml
@@ -126,39 +126,6 @@
    name="ac_text_name">
    List Name
   </text>
-  <text
-   bottom_delta="20"
-   left_delta="-2"
-   height="16"
-   width="40"
-   follows="left|top"
-   halign="center"
-   font="SansSerifSmall"
-   mouse_opaque="true"
-   name="ac_text2">
-   Author:
-  </text>
-  <view_border
-   bottom_delta="-0"
-   left_delta="42"
-   height="16"
-   width="140"
-   follows="left|top"
-   bevel_style="in"
-   mouse_opaque="false"
-   name="ac_box2"/>
-  <text
-   bottom_delta="0"
-   left_delta="0"
-   height="16"
-   width="140"
-   follows="left|top"
-   halign="center"
-   font="SansSerifSmall"
-   mouse_opaque="true"
-   name="ac_text_author">
-   Author Name
-  </text>
   <check_box
    bottom_delta="20"
    left_delta="-32"
@@ -188,34 +155,6 @@
    label_width="0"
    name="ac_priority"
    tool_tip="This number determine what order your list will be used to replace words.  A higher priority means it will be used before lower priority lists."/>
-  <check_box
-   bottom_delta="20"
-   left_delta="-120"
-   height="16"
-   width="100"
-   enabled="true"
-   follows="left|top"
-   font="SansSerifSmall"
-   mouse_opaque="true"
-   radio_style="false"
-   label="Show Notifications"
-   control_name="ac_list_show"
-   name="ac_list_show"
-   tool_tip="Having this enabled will make a notification pop up every time a word is replaced."/>
-  <check_box
-   bottom_delta="20"
-   left_delta="-0"
-   height="16"
-   width="100"
-   enabled="true"
-   follows="left|top"
-   font="SansSerifSmall"
-   mouse_opaque="true"
-   radio_style="false"
-   label="Word Style"
-   control_name="ac_list_style"
-   name="ac_list_style"
-   tool_tip="Having this checked means the list is for full words that should be replaced, unchecked means that it will look within words contents as well."/>
   <button
    top="100"
    left="5"
@@ -279,7 +218,7 @@
    left="10"
    top="450"
    width="364">
-   Original text:
+   Keyword:
   </text>
   <line_editor
    follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 5680c6e676..afc5b916e7 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6764,13 +6764,6 @@ One or more of your Voice Morphs will expire in less than [INTERVAL] days.
   </notification>
 
   <notification
-     icon="notifytip.tga"
-     name="AutoReplace"
-     type="notifytip">
-    &apos;[BEFORE]&apos; has been auto replaced by &apos;[REPLACEMENT]&apos;
-    based on your [LISTNAME] list.
-  </notification>
-  <notification
    icon="notify.tga"
    name="VoiceEffectsNew"
    sound="UISndAlert"