Merge with SVN viewer-2.0.0-3 branch

6 files changed, 57 insertions, 46 deletions

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 352ec79385..ef9e22d908 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2138,6 +2138,17 @@
          layout="topleft"
          name="Network"
          tear_off="true">
+            <menu_item_check
+             label="Pause Agent"
+             layout="topleft"
+             name="AgentPause">
+                <menu_item_check.on_check
+                 function="CheckControl"
+                 parameter="AgentPause" />
+                <menu_item_check.on_click
+                 function="ToggleControl"
+                 parameter="AgentPause" />
+            </menu_item_check>
             <menu_item_call
              label="Enable Message Log"
              layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index 01602dc906..d90be9ea25 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -212,7 +212,7 @@
          top_pad="15"
          value="Account Status:"
          width="100" />
-        <link
+       <!-- <link
          type="string"
          follows="left|top"
          font="SansSerifSmall"
@@ -223,7 +223,7 @@
          name="my_account_link"
          top_delta="0"
 	 value="Go to Dashboard"
-         width="100"/>
+         width="100"/> -->
         <text
          follows="left|top|right"
          height="15"
@@ -246,7 +246,7 @@
          top_pad="15"
          value="Partner:"
          width="100" />
-	<link
+	<!--<link
          follows="left|top"
          height="15"
 	 font.style="UNDERLINE"
@@ -255,18 +255,18 @@
          name="partner_edit_link"
          top_delta="0"
          value="Edit"
-         width="100" />
+         width="100" />  -->
         <panel
          follows="left|top|right"
          height="15"
          layout="topleft"
          left="10"
          name="partner_data_panel"
-         top_pad="10"
+         top_pad="5"
          width="255">
             <text
              follows="left|top|right"
-             height="30"
+             height="15"
              layout="topleft"
              left="0"
              name="partner_text"
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 d7736832a3..a34b005448 100644
--- a/indra/newview/skins/default/xui/en/widgets/filter_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/filter_editor.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<filter_editor select_on_focus="true"

-               background_image_disabled="TextField_Search_Disabled"

-               background_image_focused="TextField_Search_Active">

-  <clear_filter_button label="" 

-                       image_unselected="Icon_Close_Foreground"

-                       image_selected="Icon_Close_Press" />

-</filter_editor>

+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<filter_editor select_on_focus="true"
+               background_image_disabled="TextField_Search_Disabled"
+               background_image_focused="TextField_Search_Active">
+  <clear_filter_button label="" 
+                       image_unselected="Icon_Close_Foreground"
+                       image_selected="Icon_Close_Press" />
+</filter_editor>
diff --git a/indra/newview/skins/default/xui/en/widgets/list_view.xml b/indra/newview/skins/default/xui/en/widgets/list_view.xml
index c66aeb57a0..2e976bc755 100644
--- a/indra/newview/skins/default/xui/en/widgets/list_view.xml
+++ b/indra/newview/skins/default/xui/en/widgets/list_view.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<list_view

-  fg_selected_color="ListViewSelectedFgColor"

-  bg_selected_color="ListViewSelectedBgColor"

-  bg_color="ListViewBgColor"

-  />

+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<list_view
+  fg_selected_color="ListViewSelectedFgColor"
+  bg_selected_color="ListViewSelectedBgColor"
+  bg_color="ListViewBgColor"
+  />
diff --git a/indra/newview/skins/default/xui/en/widgets/split_button.xml b/indra/newview/skins/default/xui/en/widgets/split_button.xml
index b0367b599b..c0d3c6d7f6 100644
--- a/indra/newview/skins/default/xui/en/widgets/split_button.xml
+++ b/indra/newview/skins/default/xui/en/widgets/split_button.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<split_button 

- font="SansSerifSmall"

- arrow_position="left"

- follows="right|top">

-    <split_button.arrow_button 

-     name="Arrow Button"

-     label=""

-     font="SansSerifSmall"

-     scale_image="true"

-     image_selected="camera_presets/camera_presets_arrow.png"

-     image_unselected="camera_presets/camera_presets_arrow.png"

-     image_disabled_selected="camera_presets/camera_presets_arrow.png" 

-     image_disabled="camera_presets/camera_presets_arrow.png"

-     width="10"/>

-    <split_button.items_panel

-     background_visible="true"

-     border="true"

-     bg_alpha_color="1 1 1 1"

-     bg_opaq_color="1 1 1 1"

-     layout="topleft"

-     name="item_buttons"

-    />

-</split_button>

+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<split_button 
+ font="SansSerifSmall"
+ arrow_position="left"
+ follows="right|top">
+    <split_button.arrow_button 
+     name="Arrow Button"
+     label=""
+     font="SansSerifSmall"
+     scale_image="true"
+     image_selected="camera_presets/camera_presets_arrow.png"
+     image_unselected="camera_presets/camera_presets_arrow.png"
+     image_disabled_selected="camera_presets/camera_presets_arrow.png" 
+     image_disabled="camera_presets/camera_presets_arrow.png"
+     width="10"/>
+    <split_button.items_panel
+     background_visible="true"
+     border="true"
+     bg_alpha_color="1 1 1 1"
+     bg_opaq_color="1 1 1 1"
+     layout="topleft"
+     name="item_buttons"
+    />
+</split_button>
diff --git a/indra/newview/skins/default/xui/en/widgets/tab_container.xml b/indra/newview/skins/default/xui/en/widgets/tab_container.xml
index 7aad55fb37..6dfb6ecf9c 100644
--- a/indra/newview/skins/default/xui/en/widgets/tab_container.xml
+++ b/indra/newview/skins/default/xui/en/widgets/tab_container.xml
@@ -3,7 +3,7 @@
                tab_max_width="150"
                tab_top_image_unselected="TabTop_Middle_Off"
                tab_top_image_selected="TabTop_Middle_Selected"
-               tab_bottom_image_unselected="tab_bottom_blue.tga"
-               tab_bottom_image_selected="tab_bottom_selected_blue.tga"
+               tab_bottom_image_unselected="Toolbar_Left_Off"
+               tab_bottom_image_selected="Toolbar_Left_Selected"
                tab_left_image_unselected="TabTop_Left_Off"
                tab_left_image_selected="TabTop_Left_Selected"/>
\ No newline at end of file