From 20e56a6925b4d4106059a73a22170beb5a38be1e Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Tue, 13 Oct 2009 16:25:48 +0000
Subject: merge
 https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1992
 https://svn.aws.productengine.com/secondlife/pe/stable-2@2004 ->
 viewer-2.0.0-3 * Bugs: EXT-1091 EXT-1418 EXT-996 EXT-1150 EXT-1188 EXT-1417
 EXT-1181 EXT-1058 EXT-1397 EXT-836 EXT-1437 EXT-1379 * Dev: EXT-1291 EXT-1255
 EXT-992 EXT-96 EXT-1157

---
 .../skins/default/xui/en/floater_camera.xml        |  4 +--
 .../skins/default/xui/en/floater_moveview.xml      |  4 +--
 indra/newview/skins/default/xui/en/menu_viewer.xml |  9 -------
 .../skins/default/xui/en/panel_bottomtray.xml      |  6 ++---
 .../skins/default/xui/en/panel_chat_item.xml       |  2 +-
 .../skins/default/xui/en/panel_nearby_chat_bar.xml | 29 ++++++++++++++++------
 .../skins/default/xui/en/widgets/accordion_tab.xml |  8 +++++-
 7 files changed, 36 insertions(+), 26 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml
index c4a2654403..86c75a3946 100644
--- a/indra/newview/skins/default/xui/en/floater_camera.xml
+++ b/indra/newview/skins/default/xui/en/floater_camera.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  can_dock="true"
- can_minimize="false"
- can_close="false" 
+ can_minimize="true"
+ can_close="true" 
  center_horiz="true"
  follows="top"
  height="110"
diff --git a/indra/newview/skins/default/xui/en/floater_moveview.xml b/indra/newview/skins/default/xui/en/floater_moveview.xml
index 2790a12a36..f82e01dd1f 100644
--- a/indra/newview/skins/default/xui/en/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/en/floater_moveview.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  can_dock="true"
- can_close="false"
- can_minimize="false"
+ can_close="true"
+ can_minimize="true"
  center_horiz="true"
  follows="bottom"
  height="110"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index ec528d53ed..aec6f3e654 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1004,15 +1004,6 @@
              function="Floater.Show"
              parameter="hud" />
         </menu_item_call>
-      <!--  <menu_item_check
-         label="Show Quick Tips"
-         layout="topleft"
-         name="Show Quick Tips">
-            <menu_item_check.on_check
-             function="Help.CheckShowFirstTimeTip" />
-            <menu_item_check.on_click
-             function="Help.ShowQuickTips" />
-        </menu_item_check>-->
         <menu_item_separator
              layout="topleft" />
         <menu_item_call
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index 72869a3197..b4847368b2 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -83,7 +83,7 @@
              top="6"
              width="70">
                 <button.init_callback
-                 function="Button.SetFloaterToggle"
+                 function="Button.SetDockableFloaterToggle"
                  parameter="moveview" />
             </button>
         </layout_panel>
@@ -121,7 +121,7 @@
              name="camera_btn"
              width="70">
                 <button.init_callback
-                 function="Button.SetFloaterToggle"
+                 function="Button.SetDockableFloaterToggle"
                  parameter="camera" />
             </button>
  			<button
@@ -136,7 +136,7 @@
          	 image_selected="toggle_button_selected"
              image_unselected="toggle_button_off">
              <button.init_callback
-             	function="Button.SetFloaterToggle"
+             	function="Button.SetDockableFloaterToggle"
              	parameter="camera_presets"
              	/>
             </button>
diff --git a/indra/newview/skins/default/xui/en/panel_chat_item.xml b/indra/newview/skins/default/xui/en/panel_chat_item.xml
index 713c3a41a2..78f53562cd 100644
--- a/indra/newview/skins/default/xui/en/panel_chat_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_chat_item.xml
@@ -16,7 +16,7 @@
 		  />
     	<text
         	width="130" top="25" left="40" height="20" follows="left|right|top"
-        	font="SansSerifBigBold" text_color="white" word_wrap="true"
+        	font="SansSerifBigBold" text_color="white" word_wrap="false" use_ellipses="true"
         	mouse_opaque="true" name="sender_name" >
 	      Jerry Knight
     	</text>
diff --git a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
index 4088d96ebf..d914583352 100644
--- a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
@@ -21,15 +21,28 @@
      tool_tip="Press Enter to say, Ctrl-Enter to shout."
      top="3"
      width="250" />
+    <output_monitor
+     auto_update="true"
+     follows="right"
+     draw_border="false"
+     halign="left"
+     height="16"
+     layout="topleft"
+     left_pad="-24"
+     mouse_opaque="true"
+     name="chat_zone_indicator"
+     top="4"
+     visible="true"
+     width="20" />
     <button 
-	   follows="right" 
-	   width="45" 
-	   top="3" 
-	   layout="topleft" 
-	   left_pad="5"
-	   label="Log" 
-	   height="20">
-      <button.commit_callback function="Floater.Toggle" parameter="nearby_chat"/>
+     follows="right" 
+     width="45"
+     top="3" 
+     layout="topleft" 
+     left_pad="5"
+     label="Log" 
+     height="20">
+    <button.commit_callback function="Floater.Toggle" parameter="nearby_chat"/>
     </button>
     <chiclet_talk
      follows="right"
diff --git a/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml b/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml
index df5ea24c73..3ff0b3062a 100644
--- a/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml
+++ b/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <accordion_tab
+    header_bg_color="0.68 0.68 0.68 1"
+    header_txt_color="0.68 0.68 0.68 1"
     header_collapse_img="Accordion_ArrowClosed_Off"
     header_collapse_img_pressed="Accordion_ArrowClosed_Press"
     header_expand_img="Accordion_ArrowOpened_Off"
-    header_expand_img_pressed="Accordion_ArrowOpened_Press" />
+    header_expand_img_pressed="Accordion_ArrowOpened_Press"
+    header_image="Accordion_Off.png"
+    header_image_over="Accordion_Over"
+    header_image_pressed="Accordion_Press"
+    />
-- 
cgit v1.2.3