4 files changed, 15 insertions, 26 deletions

diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml b/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml
index 86dc5c7..0cbd7c6 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml
@@ -166,10 +166,12 @@
                 <on_click filter="" function="Inventory.DoToSelected" userdata="copy_uuid" />
         </menu_item_call>
         <menu_item_separator name="Copy Separator" />
+<!-- See IMP-961 http://redmine.kokuaviewer.org/issues/961
   <menu_item_call bottom_delta="-18" height="18" label="Cut" left="0" mouse_opaque="true"
              name="Cut" width="128">
     <on_click filter="" function="Inventory.DoToSelected" userdata="cut" />
   </menu_item_call>
+-->
   <menu_item_call bottom_delta="-18" height="18" label="Copy" left="0" mouse_opaque="true"
              name="Copy" width="128">
     <on_click filter="" function="Inventory.DoToSelected" userdata="copy" />
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 c037439..aedda8a 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
@@ -73,7 +73,7 @@ USE left="270" FOR TABBING OPTIONS
       
       <check_box bottom_delta="-25" enabled="true" follows="left|top"
           font="SansSerifSmall" height="16" initial_value="false"
-          label="Show client names in nametags" left_delta="30" mouse_opaque="true"
+          label="Show client names in nametags" left="50" mouse_opaque="true"
           name="client_name_tag_check" radio_style="false" width="160" />
       <check_box bottom_delta="0" enabled="true" follows="left|top"
            font="SansSerifSmall" height="16" initial_value="false"
@@ -81,12 +81,16 @@ USE left="270" FOR TABBING OPTIONS
            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="50" mouse_opaque="true"
+           label="Show client name tag colors" left="50" mouse_opaque="true"
+           name="client_colors_check" radio_style="false" width="160" />
+      <check_box bottom_delta="0" enabled="true" follows="left|top"
+           font="SansSerifSmall" height="16" initial_value="false"
+           label="Show your client name to others" left="270" mouse_opaque="true"
            name="client_name_tag_broadcast_check" radio_style="false" width="217" />
       <check_box bottom_delta="-18" 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_delta="0" mouse_opaque="true"
+           label="Animate avatar when editing appearance" left="50" mouse_opaque="true"
            name="appearance_anim_check" radio_style="false" width="217" />
       <check_box bottom_delta="-18" control_name="HeadFollowsMouse" enabled="true"
            follows="left|top" font="SansSerifSmall" height="16"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
index e14442a..cf947ee 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
@@ -215,7 +215,7 @@ USE left="270" FOR TABBING OPTIONS
 
       <text bottom_delta="-30" follows="left|top" font="SansSerifSmall" height="16" left_delta="-30"
          name="EmSpell_txt1" width="512">
-        Current language (dictionary):
+        Base dictionary:
       </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="EmeraldSpellBase" width="250"
@@ -223,13 +223,13 @@ USE left="270" FOR TABBING OPTIONS
 
       <text bottom_delta="-30" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
          name="EmSpell_txt3" width="512">
-        Downloaded languages (dictionaries):
+        Available (inactive) extra 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_Avail" width="250"
          control_name="EmSpell_Avail" tool_tip=""/>
 
-      <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20" label="Install"
+      <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20" label="Activate"
          name="EmSpell_Add" tool_tip="" left_delta="255" width="110"/>
 
       <button bottom_delta="-22" follows="left|top" font="SansSerifSmall" height="20" label="Download More..."
@@ -237,13 +237,13 @@ USE left="270" FOR TABBING OPTIONS
 
       <text bottom_delta="-30" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
          name="EmSpell_txt2" width="512">
-        Additional custom languages (dictionaries):
+        Active extra 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="250"
          control_name="EmSpell_Installed" tool_tip=""/>
 
-      <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20" label="Remove"
+      <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20" label="Deactivate"
          name="EmSpell_Remove" tool_tip="" left_delta="255" width="110"/>
 
       <!--<button bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="18" label="Edit Custom dictionary"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_colors.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_colors.xml
index 9b55822..04e71d4 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_colors.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_colors.xml
@@ -33,24 +33,7 @@ USE left="270" FOR TABBING OPTIONS
              tool_tip="Click to open Color Picker" width="65" />
   
   
-  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-        bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
-        font="SansSerifSmall" h_pad="0" halign="left" height="10" left="270"
-        mouse_opaque="true" name="client_tag_color_textbox" v_pad="0" width="394">
-    Client Tag Color:
-  </text>
-  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-80"
-       can_apply_immediately="true" color="0.79 0.44 0.88 1"
-       enabled="true" follows="left|top"
-       height="65" label="Imprudence" left_delta="30" mouse_opaque="true"
-       name="client_tag_color" width="65" />
-  <check_box bottom_delta="45" enabled="true" follows="left|top"
-       font="SansSerifSmall" height="16" initial_value="false"
-       label="Color client tags" left_delta="76" mouse_opaque="true"
-       name="client_name_color_check" radio_style="false" width="160" />
-  
-  
-  <view_border bevel_style="none" border_thickness="1" bottom_delta="-60" follows="left|top"
+  <view_border bevel_style="none" border_thickness="1" bottom_delta="0" follows="left|top"
        height="1" left="55" name="border" width="380" />