merge updates

8 files changed, 146 insertions, 0 deletions

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 8702ebde2a..bc0363014a 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -54,6 +54,8 @@ with the same filename but different name
 
   <texture name="Arrow_Down" file_name="widgets/Arrow_Down.png"	preload="true" />
   <texture name="Arrow_Up" file_name="widgets/Arrow_Up.png" preload="true" />
+  <texture name="Arrow_Left" file_name="widgets/Arrow_Left.png" preload="true" />
+  <texture name="Arrow_Right" file_name="widgets/Arrow_Right.png" preload="true" />
 
   <texture name="AudioMute_Off" file_name="icons/AudioMute_Off.png" preload="false" />
   <texture name="AudioMute_Over" file_name="icons/AudioMute_Over.png" preload="false" />
diff --git a/indra/newview/skins/default/textures/widgets/Arrow_Left.png b/indra/newview/skins/default/textures/widgets/Arrow_Left.png
new file mode 100644
index 0000000000..a424282839
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/Arrow_Left.png
diff --git a/indra/newview/skins/default/textures/widgets/Arrow_Right.png b/indra/newview/skins/default/textures/widgets/Arrow_Right.png
new file mode 100644
index 0000000000..e32bee8f34
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/Arrow_Right.png
diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index 402868bb97..eebc3a9cca 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -120,6 +120,12 @@
          layout="topleft"
          help_topic="preferences_advanced1_tab"
          name="advanced1" />
+        <panel
+         class="panel_preference"
+         filename="panel_preferences_spellcheck.xml"
+         label="Spell Check"
+         layout="topleft"
+         name="spell_check" />
     </tab_container>
 
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
index be3b2d179d..2e1c8ce670 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
@@ -70,6 +70,7 @@
      max_length="65536"
      name="Notecard Editor"
      parse_urls="false" 
+     spellcheck="true"
      tab_group="1"
      top="46"
      width="392"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_pick.xml b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
index 2ec2e03e8c..6d0be7fdec 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
@@ -134,6 +134,7 @@
          top_pad="2"
          max_length="1023"
          name="pick_desc"
+         spellcheck="true"
          text_color="black"
          word_wrap="true" />
         <text
diff --git a/indra/newview/skins/default/xui/en/panel_group_notices.xml b/indra/newview/skins/default/xui/en/panel_group_notices.xml
index 607e1bb213..6d5fb51e85 100644
--- a/indra/newview/skins/default/xui/en/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_notices.xml
@@ -141,6 +141,7 @@ Maximum 200 per group daily
          max_length_bytes="63"
          name="create_subject"
          prevalidate_callback="ascii"
+         spellcheck="true"
          width="218" />
         <text
          follows="left|top"
@@ -161,6 +162,7 @@ Maximum 200 per group daily
          left_pad="3"
          max_length="511"
          name="create_message"
+         spellcheck="true"
          top_delta="0"
          width="218"
          word_wrap="true" />
@@ -309,6 +311,7 @@ Maximum 200 per group daily
          left_pad="3"
          max_length_bytes="63"
          name="view_subject"
+         spellcheck="true"
          top_delta="-1"
          visible="false"
          width="200" />
@@ -333,6 +336,7 @@ Maximum 200 per group daily
          right="-1"
          max_length="511"
          name="view_message"
+         spellcheck="true"
          top_delta="-40"
          width="313"
          word_wrap="true" />
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_spellcheck.xml b/indra/newview/skins/default/xui/en/panel_preferences_spellcheck.xml
new file mode 100644
index 0000000000..9b5d429846
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_preferences_spellcheck.xml
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ border="true"
+ follows="left|top|right|bottom"
+ height="408"
+ label="Spell Check"
+ layout="topleft"
+ left="102"
+ name="spellcheck"
+ top="1"
+ width="517">
+    <check_box
+     control_name="SpellCheck"
+     enabled="true"
+     follows="top|left"
+     height="16"
+     label="Enable spell checking"
+     layout="topleft"
+     left="30"
+     name="check_spellcheck"
+     top="30"
+     width="250"
+    />
+    <text
+     enabled_control="SpellCheck"
+     follows="top|left"
+     height="10"
+     label="Logs:"
+     layout="topleft"
+     left="55"
+     mouse_opaque="false"
+     name="text_spellcheck_dict"
+     top_pad="15"
+     type="string"
+     width="90"
+    >
+      Main dictionary :
+    </text>
+    <combo_box
+     enabled_control="SpellCheck"
+     follows="top|left"
+     height="23"
+     layout="topleft"
+     left_pad="10"
+     name="combo_spellcheck_dict"
+     top_pad="-15"
+     width="175"
+    />
+
+    <text
+     enabled_control="SpellCheck"
+     follows="top|left"
+     height="10"
+     label="Logs:"
+     layout="topleft"
+     left="55"
+     mouse_opaque="false"
+     name="text_spellcheck_additional"
+     top_pad="15"
+     type="string"
+     width="190"
+    >
+      Additional dictionaries :
+    </text>
+    <text
+     follows="top|left"
+     height="12"
+     layout="topleft"
+     left="80"
+     length="1"
+     name="text_spellcheck_available"
+     top_pad="10"
+     type="string"
+     width="175">
+        Available
+    </text>
+    <text
+     follows="top|left"
+     height="12"
+     type="string"
+     left_pad="45"
+     length="1"
+     layout="topleft"
+     name="text_spellcheck_active"
+     width="175">
+        Active
+    </text>
+    <scroll_list
+     follows="top|left"
+     height="155"
+     layout="topleft"
+     left="80"
+     multi_select="true"
+     name="list_spellcheck_available"
+     sort_column="0"
+     sort_ascending="true" 
+     width="175" />
+    <button
+     follows="top|left"
+     height="26"
+     image_overlay="Arrow_Right"
+     hover_glow_amount="0.15"
+     layout="topleft"
+     left_pad="10"
+     name="btn_spellcheck_moveright"
+     top_delta="50"
+     width="25">
+    </button>
+    <button
+     follows="top|left"
+     height="26"
+     image_overlay="Arrow_Left"
+     hover_glow_amount="0.15"
+     layout="topleft"
+     name="btn_spellcheck_moveleft"
+     top_delta="30"
+     width="25">
+    </button>
+    <scroll_list
+     follows="top|left"
+     height="155"
+     layout="topleft"
+     left_pad="10"
+     multi_select="true"
+     name="list_spellcheck_active"
+     sort_column="0"
+     sort_ascending="true" 
+     top_pad="-105"
+     width="175"
+    />
+
+</panel>