From f19ee13c0450e0e16e7c8c9d7f700e11c36886ef Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Fri, 21 Oct 2011 14:43:16 -0700
Subject: EXP-1430 FIX -- Minimizing voice settings floater corrupts layout
 throughout rest of session

* Added minimum size for layout panel that holds voice morphing and removed
  user resizability.

Reviewed by Richard.
---
 indra/newview/skins/default/xui/en/floater_voice_controls.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
index 93a04050b6..6807b01fa3 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
@@ -89,7 +89,7 @@
              visible="true"
              width="20" />
         </layout_panel>
-        <layout_panel name="leave_call_panel" height="26" auto_resize="false">
+        <layout_panel name="leave_call_panel" height="26" min_height="26" user_resize="false" auto_resize="false">
         <layout_stack
          clip="true"
          follows="left|top|right"
-- 
cgit v1.2.3


From 92fd54c6c6c337b5b7d46f038075a5a28ebb03b3 Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Fri, 21 Oct 2011 16:29:36 -0700
Subject: EXP-1434 FIX -- Mini-location bar disappears after
 maximizing/restoring viewer window

* The topinfo bar no longer follows the right edge of the window so it doesn't
  scale down and disappear.
---
 indra/newview/skins/default/xui/en/panel_topinfo_bar.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml b/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml
index 79f29777ce..fc527f5f9d 100644
--- a/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml
@@ -4,7 +4,7 @@
  background_opaque="false"
  bg_opaque_color="Black_50"
  bg_alpha_color="Black_50"
- follows="left|top|right"
+ follows="left|top"
  height="19"
  layout="topleft"
  name="topinfo_bar"
-- 
cgit v1.2.3


From 338914bd7d7e776d3ca5a4eb9a579fcbe53cf1b9 Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Mon, 24 Oct 2011 14:17:15 +0200
Subject: EXP-1400 FIXED (Call request docking icon overlays other toolbar
 buttons when speak button in side toolbar)

- LLDockableFloater::getDockTongue to init dock tongue with proper image depending on floater dock side, also added images for left and right tongues.

- Added proper call floater positioning relatively to the speak button
---
 .../skins/default/textures/windows/Flyout_Left.png        | Bin 0 -> 271 bytes
 .../skins/default/textures/windows/Flyout_Right.png       | Bin 0 -> 280 bytes
 .../skins/default/xui/en/floater_outgoing_call.xml        |   1 +
 3 files changed, 1 insertion(+)
 create mode 100644 indra/newview/skins/default/textures/windows/Flyout_Left.png
 create mode 100644 indra/newview/skins/default/textures/windows/Flyout_Right.png

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/windows/Flyout_Left.png b/indra/newview/skins/default/textures/windows/Flyout_Left.png
new file mode 100644
index 0000000000..6ac9fe2efd
Binary files /dev/null and b/indra/newview/skins/default/textures/windows/Flyout_Left.png differ
diff --git a/indra/newview/skins/default/textures/windows/Flyout_Right.png b/indra/newview/skins/default/textures/windows/Flyout_Right.png
new file mode 100644
index 0000000000..aa1f0625aa
Binary files /dev/null and b/indra/newview/skins/default/textures/windows/Flyout_Right.png differ
diff --git a/indra/newview/skins/default/xui/en/floater_outgoing_call.xml b/indra/newview/skins/default/xui/en/floater_outgoing_call.xml
index 9db6568ee3..ffbb6aa28b 100644
--- a/indra/newview/skins/default/xui/en/floater_outgoing_call.xml
+++ b/indra/newview/skins/default/xui/en/floater_outgoing_call.xml
@@ -8,6 +8,7 @@
  layout="topleft"
  name="outgoing call"
  help_topic="outgoing_call"
+ save_dock_state="true"
  title="CALLING"
  width="410">
     <floater.string
-- 
cgit v1.2.3


From 08ee54158fe71feebaa11ebade18d45be4caf90b Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Mon, 24 Oct 2011 13:56:14 -0700
Subject: EXP-1458 FIX Chat text entry bar does not have focus when chat
 floater is opened while chat history is toggled open made expando-button
 chrome, so it doesn't steal focus

---
 indra/newview/skins/default/xui/en/floater_chat_bar.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_chat_bar.xml b/indra/newview/skins/default/xui/en/floater_chat_bar.xml
index 989b4a0580..86191b789c 100644
--- a/indra/newview/skins/default/xui/en/floater_chat_bar.xml
+++ b/indra/newview/skins/default/xui/en/floater_chat_bar.xml
@@ -68,6 +68,7 @@
      image_pressed="ComboButton_UpSelected"
      image_pressed_selected="ComboButton_Selected"
      height="23"
+     chrome="true"
      name="show_nearby_chat"
      tool_tip="Shows/hides nearby chat log">
     </button>
-- 
cgit v1.2.3


From 4af2cc2e743a79944df6aef6d209ea8b8a1c33e2 Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Mon, 24 Oct 2011 15:52:50 -0700
Subject: EXP-1421 FIX -- Linden Dollars Still visually looks like a button.

* L$ background color now matches the menu bar.  The tooltip and click behavior
  have been left untouched, per design.
---
 indra/newview/skins/default/xui/en/panel_status_bar.xml | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index 422bbada7f..b321e0162e 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -2,7 +2,7 @@
 <panel
  background_opaque="true"
  background_visible="true"
- bg_opaque_color="MouseGray"
+ bg_opaque_color="DkGray"
  chrome="true"
  follows="top|right"
  height="19"
@@ -38,23 +38,20 @@
     left="-370"
     width="160"
     top="1"
-    follows="right|top" 
-    name="balance_bg" 
-    bg_visible="true"
-    background_opaque="true" 
-    bg_opaque_image="bevel_background">
+    follows="right|top"
+    name="balance_bg">
     <text
      halign="center"
      font="SansSerifSmall"
      follows="all"
      height="18"
-     left="0" 
+     left="0"
      name="balance"
      tool_tip="Click to refresh your L$ balance"
      v_pad="4"
      top="0"
-     wrap="false" 
-     value="L$20" 
+     wrap="false"
+     value="L$20"
      width="40" />
     <button
      halign="center"
-- 
cgit v1.2.3


From 28fc98dea3b65e986c0fd8ffa71a81d2db7fb700 Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Mon, 24 Oct 2011 15:53:50 -0700
Subject: EXP-1453 FIX -- Toybox labels differ in menus and titles

* All text updated to read "Toolbar buttons" in the appropriate ways.
---
 indra/newview/skins/default/xui/en/floater_toybox.xml | 2 +-
 indra/newview/skins/default/xui/en/menu_toolbars.xml  | 2 +-
 indra/newview/skins/default/xui/en/menu_viewer.xml    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_toybox.xml b/indra/newview/skins/default/xui/en/floater_toybox.xml
index c7e09bf45e..ef3951a1cd 100644
--- a/indra/newview/skins/default/xui/en/floater_toybox.xml
+++ b/indra/newview/skins/default/xui/en/floater_toybox.xml
@@ -13,7 +13,7 @@
   open_positioning="centered"
   save_rect="true"
   single_instance="true"
-  title="CUSTOMIZE TOOLBARS"
+  title="TOOLBAR BUTTONS"
   width="650">
   <text
     follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/menu_toolbars.xml b/indra/newview/skins/default/xui/en/menu_toolbars.xml
index 59912b5503..7384114d7d 100644
--- a/indra/newview/skins/default/xui/en/menu_toolbars.xml
+++ b/indra/newview/skins/default/xui/en/menu_toolbars.xml
@@ -3,7 +3,7 @@
       layout="topleft"
       name="Toolbars Popup"
       visible="false">
-  <menu_item_call label="Choose buttons..."
+  <menu_item_call label="Toolbar buttons..."
                   layout="topleft"
                   name="Chose Buttons">
     <menu_item_call.on_click function="Floater.Show"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 63e50b0b9f..58f6a3251f 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -166,7 +166,7 @@
              parameter="preferences" />
         </menu_item_call>
          <menu_item_call
-         label="Toolbars..."
+         label="Toolbar buttons..."
          name="Toolbars"
          shortcut="control|T">
             <menu_item_call.on_click
-- 
cgit v1.2.3


From 54b16e06a649808cc3bbc94cbe9e9b74211c99f6 Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Mon, 24 Oct 2011 16:26:17 -0700
Subject: EXP-1455 Ctrl-Shift-I no longer opens a second inventory window

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 63e50b0b9f..9afe791372 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -43,6 +43,15 @@
          function="Floater.Toggle"
          parameter="inventory" />
       </menu_item_check>
+      <menu_item_call
+       label="New Inventory Window"
+       name="NewInventoryWindow"
+       shortcut="control|shift|I"
+       visible="false">
+        <menu_item_call.on_click
+         function="Inventory.NewWindow"
+         parameter="" />
+      </menu_item_call>
       <menu_item_check
        label="Gestures..."
        name="Gestures"
-- 
cgit v1.2.3


From 8d6e7fa02c0d5cd18f91ac6862079ff4fa0719d4 Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Mon, 24 Oct 2011 16:49:00 -0700
Subject: * Fixed destination guide floater to display on login based on per
 account   "DisplayDestinationsOnInitialRun" setting or initial agent SL
 login. * Added toolbar enumeration for toolbar view so queries for commands
 can now   indicate where the command currently is on the left, right or
 bottom toolbars. * Updated toybox toolbar button tooltips to indicate where
 the command currently   resides in the view. * Added unused function to allow
 toolbar buttons to be changed to flash   indefinitely.

Reviewed by Richard.
---
 indra/newview/skins/default/xui/en/strings.xml         | 6 +++++-
 indra/newview/skins/default/xui/en/widgets/toolbar.xml | 4 ++++
 2 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 308208869d..5e5bc0bde0 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3705,7 +3705,11 @@ Try enclosing path to the editor with double quotes.
   <string name="Command_View_Tooltip">Changing camera angle</string>
   <string name="Command_Voice_Tooltip">Volume controls for calls and people near you in world</string>
 
- <!-- Mesh UI terms -->
+  <string name="Toolbar_Bottom_Tooltip">currently in your bottom toolbar</string>
+  <string name="Toolbar_Left_Tooltip"  >currently in your left toolbar</string>
+  <string name="Toolbar_Right_Tooltip" >currently in your right toolbar</string>
+
+  <!-- Mesh UI terms -->
   <string name="Retain%">Retain%</string>
   <string name="Detail">Detail</string>
   <string name="Better Detail">Better Detail</string>
diff --git a/indra/newview/skins/default/xui/en/widgets/toolbar.xml b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
index 7e7a9c61cf..0aa478ace9 100644
--- a/indra/newview/skins/default/xui/en/widgets/toolbar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
@@ -30,6 +30,8 @@
                         image_overlay_alignment="left"
                         use_ellipses="true"
                         auto_resize="true"
+                        button_flash_count="99999"
+                        button_flash_rate="1.0"
                         flash_color="EmphasisColor"/>
   <button_icon pad_left="10"
                pad_right="10"
@@ -49,5 +51,7 @@
                chrome="true"
                use_ellipses="true"
                auto_resize="true"
+               button_flash_count="99999"
+               button_flash_rate="1.0"
                flash_color="EmphasisColor"/>
 </toolbar>
-- 
cgit v1.2.3