3 files changed, 131 insertions, 68 deletions

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_dictionaries.xml b/linden/indra/newview/skins/default/xui/en-us/floater_dictionaries.xml
new file mode 100644
index 0000000..f0564ed
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_dictionaries.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater border="false" can_close="true" can_minimize="true" bottom="500" left="500" can_resize="false" height="180" name="EmeraldIRC_dictionaries" title="Download new Dictionaries" width="300">
+     <text bottom="-50" follows="left|top" font="SansSerifSmall" height="20" left="15" name="EmDics_txt" width="300">
+Below is a list of additional dictionaries that can
+be downloaded from the Modular Systems website.
+
+Please select the dictionary you wish to have available
+for install, and then press the download button.</text>
+        <combo_box allow_text_entry="false" bottom_delta="-85" left_delta="-10" follows="left|top" height="18"
+                max_chars="255" mouse_opaque="true" name="Emerald_combo_dics" width="290"
+                control_name="Emerald_combo_dics" tool_tip=""/>
+     <button bottom_delta="-35" enabled="true" follows="left|top" font="SansSerif"
+             halign="center" height="22" label="Download" left_delta="0"
+             mouse_opaque="true" name="Emerald_dic_download" scale_image="true" width="290" />
+</floater> 
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
index 7395c62..40b05c2 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -7053,11 +7053,20 @@ Note: To comply with the Second Life Terms of Service, Imprudence did not downlo
 </notification>
 
 <notification
+  icon="alertmodal.tga"
+  label="Emerald Help"
+  name="EmeraldHelp_SpellCheck"
+  type="alertmodal">
+To Spell Check a word, right click on it and choose its replacement.
+You may choose a base dictionary which stores the language style and basic words
+You may also choose to install other word lists by choosing them from the list and "Install"
+</notification>
+
+<notification
  name="ConfirmLightShare"
  type="notify"
  icon="notify.tga">
 This region is broadcasting custom sky and water settings.
-
 Apply this region's settings? (&quot;Ignore&quot; will ignore all region settings until you leave this region.)
   <form name="form">
     <button index="0" name="apply"  text="Apply"/>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
index 310e056..669f0e2 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
@@ -2,38 +2,71 @@
 <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
      height="408" label="Advanced" left="102" mouse_opaque="true"
      name="advanced_panel" width="517">
-  
   <!-- Start organizing these when we get enough of 'em - MC -->
-  
-  <check_box bottom="-30" enabled="true"
-       follows="left|top" font="SansSerifSmall" height="16"
-       initial_value="false" label="Disable login/logout screens" left="12"
-       mouse_opaque="true" name="disable_log_screen_check" radio_style="false"
-       width="217" />
-  <check_box bottom_delta="-18" enabled="true" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="false"
-             label="Disable teleport screen" left="12" mouse_opaque="true"
-             name="disable_tp_screen_check" radio_style="false" width="217" />
-  <check_box bottom_delta="-25" enabled="true" follows="left|top"
-       font="SansSerifSmall" height="16" initial_value="false"
-       label="Show client names in nametags" left="12" mouse_opaque="true"
-       name="client_name_tag_check" radio_style="false" width="160" />
-  <check_box bottom_delta="-18" enabled="true" follows="left|top"
-       font="SansSerifSmall" height="16" initial_value="false"
-       label="Show client names with color" left_delta="0" mouse_opaque="true"
-       name="client_name_color_check" radio_style="false" width="160" />
-  <check_box bottom_delta="-18" enabled="true" follows="left|top"
-       font="SansSerifSmall" height="16" initial_value="false"
-       label="Show client names in hovertip" left_delta="0" mouse_opaque="true"
-       name="client_name_hover_check" radio_style="false" width="160" />
-  <check_box bottom_delta="-18" enabled="true" follows="left|top"
-       font="SansSerifSmall" height="16" initial_value="false"
-       label="Show your client name to others" left_delta="0" mouse_opaque="true"
-       name="client_name_tag_broadcast_check" radio_style="false" width="217" />
-  <check_box bottom_delta="-25" enabled="true" follows="left|top"
-       font="SansSerifSmall" height="16" initial_value="false"
-       label="Enable shadows (WARNING: unstable and requires Ultra graphics)" left="12" mouse_opaque="true"
-       name="shadows_check" radio_style="false" width="217" />
+  <tab_container label="Page 2" bottom="0" height="405" left="0" mouse_opaque="false"
+   name="tab2" tab_min_width="50" tab_position="top" width="495" bg_opaque_color="0,0,0,0.0">
+    
+    <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
+     height="408" label="Main" left="102" mouse_opaque="true"
+     name="main_panel" width="517">
+      <check_box bottom="-30" enabled="true"
+           follows="left|top" font="SansSerifSmall" height="16"
+           initial_value="false" label="Disable login/logout screens" left="12"
+           mouse_opaque="true" name="disable_log_screen_check" radio_style="false"
+           width="217" />
+      <check_box bottom_delta="-18" enabled="true" follows="left|top"
+                 font="SansSerifSmall" height="16" initial_value="false"
+                 label="Disable teleport screen" left="12" mouse_opaque="true"
+                 name="disable_tp_screen_check" radio_style="false" width="217" />
+      <check_box bottom_delta="-25" enabled="true" follows="left|top"
+           font="SansSerifSmall" height="16" initial_value="false"
+           label="Show client names in nametag" left="12" mouse_opaque="true"
+           name="client_name_tag_check" radio_style="false" width="217" />
+      <check_box bottom_delta="-18" enabled="true" follows="left|top"
+           font="SansSerifSmall" height="16" initial_value="false"
+           label="Broadcast your client name to others" left="12" mouse_opaque="true"
+           name="client_name_tag_broadcast_check" radio_style="false" width="217" />
+      <check_box bottom_delta="-25" enabled="true" follows="left|top"
+           font="SansSerifSmall" height="16" initial_value="false"
+           label="Enable shadows (WARNING: unstable and requires Ultra graphics)" left="12" mouse_opaque="true"
+           name="shadows_check" radio_style="false" width="217" />
+      <check_box bottom_delta="-25" enabled="true" follows="left|top"
+           font="SansSerifSmall" height="16" initial_value="true"
+           label="Use server-side WindLight settings" left="12" mouse_opaque="true"
+           name="windlight_check" radio_style="false" width="217" />
+      <check_box bottom_delta="-18" enabled="true" follows="left|top"
+           font="SansSerifSmall" height="16" initial_value="false"
+           label="Use HTTP texture fetching" left="12" mouse_opaque="true"
+           name="http_texture_check" radio_style="false" width="217" />
+      <check_box bottom_delta="-18" enabled="true" follows="left|top"
+           font="SansSerifSmall" height="16" initial_value="false"
+           label="Increase rez speed via draw distance stepping" left="12" mouse_opaque="true"
+           name="speed_rez_check" radio_style="false" width="217" />
+      <spinner bottom_delta="-18" decimal_digits="0"
+           tool_tip="Interval in seconds between each draw distance increment"
+           follows="left|top" height="16" increment="1" initial_val="12"
+           label="Step interval every:" label_width="105" left_delta="20" max_val="20"
+           min_val="1" mouse_opaque="true" name="speed_rez_interval_spinner" width="145" />
+      <text bottom_delta="0" follows="top|left" height="15" left_delta="150"
+                 name="speed_rez_seconds_text" width="115">
+        seconds
+      </text>
+      <check_box bottom_delta="-25" enabled="true" follows="left|top"
+           font="SansSerifSmall" height="16" initial_value="false"
+           tool_tip="Toggle editing animation and standing up when entering appearance mode" 
+           label="Animate avatar when editing appearance" left="12" mouse_opaque="true"
+           name="appearance_anim_check" radio_style="false" width="217" />
+      <check_box bottom_delta="-25" enabled="true"
+           follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+           label="Use legacy pie menus" left="12"
+           mouse_opaque="true" name="legacy_pie_menu_checkbox" radio_style="false"
+           width="256" />
+      <check_box bottom_delta="-25" enabled="true"
+           follows="left|top" font="SansSerifSmall" height="16" hidden="false"
+           initial_value="false" label="Share language with objects" left="12"
+           mouse_opaque="true" name="language_is_public"
+           radio_style="false" tool_tip="This lets in-world objects know your preferred language."
+           width="256" />
 
   <text bottom_delta="-25" left="16" height="15" width="300"
         follows="top|left">
@@ -53,39 +86,6 @@
     </combo_item>
   </combo_box>
 
-  <check_box bottom_delta="-25" enabled="true" follows="left|top"
-       font="SansSerifSmall" height="16" initial_value="false"
-       label="Use HTTP texture fetching" left="12" mouse_opaque="true"
-       name="http_texture_check" radio_style="false" width="217" />
-  <check_box bottom_delta="-18" enabled="true" follows="left|top"
-       font="SansSerifSmall" height="16" initial_value="false"
-       label="Increase rez speed via draw distance stepping" left="12" mouse_opaque="true"
-       name="speed_rez_check" radio_style="false" width="217" />
-  <spinner bottom_delta="-18" decimal_digits="0"
-       tool_tip="Interval in seconds between each draw distance increment"
-       follows="left|top" height="16" increment="1" initial_val="12"
-       label="Step interval every:" label_width="105" left_delta="20" max_val="20"
-       min_val="1" mouse_opaque="true" name="speed_rez_interval_spinner" width="145" />
-  <text bottom_delta="0" follows="top|left" height="15" left_delta="150"
-             name="speed_rez_seconds_text" width="115">
-    seconds
-  </text>
-  <check_box bottom_delta="-25" enabled="true" follows="left|top"
-       font="SansSerifSmall" height="16" initial_value="false"
-       tool_tip="Toggle editing animation and standing up when entering appearance mode" 
-       label="Animate avatar when editing appearance" left="12" mouse_opaque="true"
-       name="appearance_anim_check" radio_style="false" width="217" />
-  <check_box bottom_delta="-25" enabled="true"
-       follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-       label="Use legacy pie menus" left="12"
-       mouse_opaque="true" name="legacy_pie_menu_checkbox" radio_style="false"
-       width="256" />
-  <check_box bottom_delta="-25" enabled="true"
-       follows="left|top" font="SansSerifSmall" height="16" hidden="false"
-       initial_value="false" label="Share language with objects" left="12"
-       mouse_opaque="true" name="language_is_public"
-       radio_style="false" tool_tip="This lets in-world objects know your preferred language."
-       width="256" />
   <check_box bottom_delta="-25" enabled="true"
        follows="left|top" font="SansSerifSmall" height="16" hidden="false"
        initial_value="false" label="Use MU* pose style chat and IM" left="12"
@@ -120,8 +120,47 @@
     </combo_item>
   </combo_box>-->
 
-  <button bottom="5" follows="left|top" font="SansSerifSmall" height="20" width="250" 
-       label="Reset All Preferences To Default" name="reset_btn" left="12" 
-       tool_tip="Reset all preferences to their default values (requires a restart)" />
+      <button bottom="30" follows="left|top" font="SansSerifSmall" height="20" width="250" 
+           label="Reset All Preferences To Default" name="reset_btn" left="12" 
+           tool_tip="Reset all preferences to their default values (requires a restart)" />
+    </panel>
 
+    <panel border="true" bottom="-580" follows="left|top|right|bottom" height="525" label="SpellCheck"
+       left="1" mouse_opaque="true" name="SpellCheck" width="418">
+      <button bottom="-25" follows="left|top" font="SansSerifSmall" height="18" label="?"
+         name="EmeraldHelp_SpellCheck" tool_tip="Click here for help regarding the settings in this page."
+         right="490" width="18"/>
+      <text bottom="-20" follows="left|top" font="SansSerifSmall" height="16" left="210"
+         name="EmSpell_txt1" width="512">Base Language</text>
+      <combo_box allow_text_entry="false" bottom_delta="-20" left_delta="-110" follows="left|top" height="18"
+         max_chars="200" mouse_opaque="true" name="EmeraldSpellBase" width="300"
+         control_name="EmeraldSpellBase" tool_tip=""/>
+      <text bottom_delta="-30" follows="left|top" font="SansSerifSmall" height="16" left="5"
+         name="EmSpell_txt2" width="512">Additional installed dictionaries</text>
+      <combo_box allow_text_entry="false" bottom_delta="-20" left_delta="0" follows="left|top" height="18"
+         max_chars="200" mouse_opaque="true" name="EmSpell_Installed" width="180"
+         control_name="EmSpell_Installed" tool_tip=""/>
+      <button bottom_delta="-0" follows="left|top" font="SansSerifSmall" height="18" label="Remove"
+       name="EmSpell_Remove" tool_tip="" left_delta="182" width="60"/>
+      <text bottom_delta="20" follows="left|top" font="SansSerifSmall" height="16" left="270"
+         name="EmSpell_txt3" width="512">Available dictionaries</text>
+      <combo_box allow_text_entry="false" bottom_delta="-20" left_delta="-10" follows="left|top" height="18"
+         max_chars="200" mouse_opaque="true" name="EmSpell_Avail" width="180"
+         control_name="EmSpell_Avail" tool_tip=""/>
+      <button bottom_delta="-0" follows="left|top" font="SansSerifSmall" height="18" label="Install"
+       name="EmSpell_Add" tool_tip="" left_delta="182" width="50"/>
+      <button bottom_delta="20" follows="left|top" font="SansSerifSmall" height="18" label="Get More!"
+         name="EmSpell_GetMore" tool_tip="" left_delta="-20" width="70"/>
+      <check_box bottom_delta="-50" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+       label="Show misspelled words in red" left="5" mouse_opaque="true" name="EmeraldSpellDisplay"
+       control_name="EmeraldSpellDisplay" width="126"/>
+      <button bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="18" label="Edit Custom dictionary"
+         name="EmSpell_EditCustom" tool_tip="" left_delta="20" width="130"/>
+      <text bottom_delta="20" follows="left|top" font="SansSerifSmall" height="16" left="250"
+         name="EmSpell_txt4" width="512">
+        To spellcheck, right click a misspelled word
+        (red or not) and click on its replacement
+      </text>
+    </panel>
+  </tab_container>
 </panel>