viewer2 merge.

5 files changed, 74 insertions, 37 deletions

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 95ce6d6ff4..07a366da7f 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -55,34 +55,42 @@
         </menu_item_call>
         <menu_item_check
          label="My Inventory"
-         layout="topleft"
          name="Inventory"
-         shortcut="control|I">
+         layout="topleft"
+         shortcut="control|shift|I"
+		 visible="false">
             <menu_item_check.on_check
-             function="SidetrayPanelVisible"
-             parameter="sidepanel_inventory" />
+             function="Floater.Visible"
+             parameter="inventory" />
             <menu_item_check.on_click
-             function="ShowSidetrayPanel"
-             parameter="sidepanel_inventory" />
+             function="Floater.Toggle"
+             parameter="inventory" />
         </menu_item_check>
-        <menu_item_call
-         label="Show Inventory in Side Tray"
+        <menu_item_check
+         label="My Inventory"
          name="ShowSidetrayInventory"
+         layout="topleft"
          shortcut="control|I"
-         visible="false">
-            <menu_item_call.on_click
+		 visible="true">
+            <menu_item_check.on_check
+             function="SidetrayPanelVisible"
+             parameter="sidepanel_inventory" />
+            <menu_item_check.on_click
              function="ShowSidetrayPanel"
              parameter="sidepanel_inventory" />
-        </menu_item_call>
-        <menu_item_call
+        </menu_item_check>
+        <menu_item_check
          label="My Gestures"
          layout="topleft"
          name="Gestures"
          shortcut="control|G">
-            <menu_item_call.on_click
+            <menu_item_check.on_check
+             function="Floater.Visible"
+             parameter="gestures" />
+            <menu_item_check.on_click
              function="Floater.Toggle"
              parameter="gestures" />
-        </menu_item_call>
+        </menu_item_check>
         <menu
          label="My Status"
          layout="topleft"
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 1f16aea2ef..5f46ad7860 100644
--- a/indra/newview/skins/default/xui/en/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_notices.xml
@@ -159,7 +159,6 @@ Maximum 200 per group daily
          left_pad="3"
          max_length="511"
          name="create_message"
-         text_type="ascii"
          top_delta="0"
          width="220"
          word_wrap="true" />
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index 433dfc17fe..2e81139ef2 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -9,13 +9,22 @@
  name="chat"
  top="1"
  width="517">
-    <radio_group
+  <text
+   follows="left|top"
+   layout="topleft"
+   left="30"
+   height="12"
+   width="120"
+   top="10">
+    Font size:
+  </text>
+  <radio_group
      height="30"
      layout="topleft"
-     left="30"
-	 control_name="ChatFontSize"
+     left="40"
+	   control_name="ChatFontSize"
      name="chat_font_size"
-     top="10"
+     top_pad="0"
      width="440">
         <radio_item
          height="16"
@@ -45,12 +54,24 @@
          top_delta="0"
          width="125" />
     </radio_group>
+
+    <text
+      follows="left|top"
+      layout="topleft"
+      left="30"
+      height="12"
+      top_pad="10" 
+      width="120"
+      >
+    Font colors:
+    </text>  
+  
     <color_swatch
      can_apply_immediately="true"
      follows="left|top"
      height="47"
      layout="topleft"
-     left="30"
+     left="40"
      name="user"
      top_pad="10"
      width="44" >
@@ -79,7 +100,7 @@
      follows="left|top"
      height="47"
      layout="topleft"
-     left="180"
+     left="190"
      name="agent"
      top_pad="-17"
      width="44" >
@@ -110,7 +131,7 @@
      height="47"
      label_width="60"
      layout="topleft"
-     left="350"
+     left="360"
      name="im"
      top_pad="-17"
      width="44">
@@ -141,7 +162,7 @@
      height="47"
      label_width="44"
      layout="topleft"
-     left="30"
+     left="40"
      name="system"
      top_pad="40"
      width="44" >
@@ -171,7 +192,7 @@
      follows="left|top"
      height="47"
      layout="topleft"
-     left="180"
+     left="190"
      name="script_error"
      top_pad="-17"
      width="44">
@@ -201,7 +222,7 @@
      follows="left|top"
      height="47"
      layout="topleft"
-     left="350"
+     left="360"
      name="objects"
      top_pad="-17"
      width="44" >
@@ -231,7 +252,7 @@
      follows="left|top"
      height="47"
      layout="topleft"
-     left="30"
+     left="40"
      name="owner"
      top_pad="40"
      width="44" >
@@ -261,7 +282,7 @@
      follows="left|top"
      height="47"
      layout="topleft"
-     left="180"
+     left="190"
      name="links"
      top_pad="-17"
      width="44" >
@@ -314,6 +335,8 @@
      top_pad="5"
      width="400" />
     <text
+     follows="left|top"
+     layout="topleft"
      left="30"
      height="20"
      width="120"
@@ -321,17 +344,20 @@
      Show IMs in:
     </text>
     <text
-	 left_pad="6"
-	 height="20"
-	 width="100"
-	 text_color="White_25"
-	 >
+     follows="left|top"
+     layout="topleft"
+     top_delta="0" 
+     left="120" 
+  	 height="20"
+	   width="100"
+     text_color="White_25"
+	  >
       (requires restart)
       </text>
     <radio_group
      height="30"
      layout="topleft"
-     left="30"
+     left="40"
      control_name="ChatWindow"
      name="chat_window"
      top_pad="0"
diff --git a/indra/newview/skins/default/xui/en/widgets/filter_editor.xml b/indra/newview/skins/default/xui/en/widgets/filter_editor.xml
index 1228f6be3d..0720621f0b 100644
--- a/indra/newview/skins/default/xui/en/widgets/filter_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/filter_editor.xml
@@ -16,6 +16,6 @@
 	  image_unselected="Search"
 	  image_selected="Search" />
   <clear_button label=""
-   image_unselected="Icon_Close_Foreground"
-   image_selected="Icon_Close_Press" />
+   image_unselected="Icon_Close_Toast"
+   image_selected="Icon_Close_Toast" />
 </filter_editor>
diff --git a/indra/newview/skins/default/xui/en/widgets/search_editor.xml b/indra/newview/skins/default/xui/en/widgets/search_editor.xml
index 1616e4c3f7..a9a760b3a4 100644
--- a/indra/newview/skins/default/xui/en/widgets/search_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/search_editor.xml
@@ -15,7 +15,11 @@
     height="13" 
 	  image_unselected="Search"
 	  image_selected="Search" />
-  <clear_button 
+  <clear_button
+   bottom="4"
+   height="16"
    image_unselected="Icon_Close_Foreground"
-   image_selected="Icon_Close_Press" />
+   image_selected="Icon_Close_Press"
+   pad_right="4"
+   width="16" />
 </search_editor>