From 5baf0de6a396b120aba4e2351ed5bff70f2562ef Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Mon, 19 Sep 2011 19:13:39 +0300
Subject: EXP-1203 FIXED (As a FUI user, I want the address bar and favorites
 to be on one line)

- Relocated address bar, combined with favorite landmarks EXP-1208
- Added dragger to change amount of space allocated to address bar and favorites bar EXP-1217
- Modified Favorites ->> More spillover EXP-1218
- Combined context menu menuitems for favorites & address bars  EXP-1219
---
 indra/newview/skins/default/xui/en/main_view.xml   |   2 +-
 .../skins/default/xui/en/menu_hide_navbar.xml      |  13 +-
 .../skins/default/xui/en/panel_navigation_bar.xml  | 319 +++++++++++----------
 3 files changed, 177 insertions(+), 157 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml
index a7d1aa963c..688349aa16 100644
--- a/indra/newview/skins/default/xui/en/main_view.xml
+++ b/indra/newview/skins/default/xui/en/main_view.xml
@@ -16,7 +16,7 @@
                 orientation="vertical"
                 top="19">
     <layout_panel auto_resize="false"
-                  height="60"
+                  height="34"
                   mouse_opaque="false"
                   name="nav_bar_container"
                   tab_stop="false"
diff --git a/indra/newview/skins/default/xui/en/menu_hide_navbar.xml b/indra/newview/skins/default/xui/en/menu_hide_navbar.xml
index 3f38d734b9..b517fd7957 100644
--- a/indra/newview/skins/default/xui/en/menu_hide_navbar.xml
+++ b/indra/newview/skins/default/xui/en/menu_hide_navbar.xml
@@ -9,7 +9,7 @@
  visible="false"
  width="128">
     <menu_item_check
-         label="Show Navigation Bar"
+         label="Show Navigation &amp; Favorites Bar"
          layout="topleft"
          name="ShowNavbarNavigationPanel">
            <on_click
@@ -19,17 +19,6 @@
              function="CheckControl"
              parameter="ShowNavbarNavigationPanel" />
     </menu_item_check>
-    <menu_item_check
-         label="Show Favorites Bar"
-         layout="topleft"
-         name="ShowNavbarFavoritesPanel">
-           <on_click
-             function="ToggleControl"
-             parameter="ShowNavbarFavoritesPanel" /> 
-             <on_check
-             function="CheckControl"
-             parameter="ShowNavbarFavoritesPanel" />
-    </menu_item_check>
     <menu_item_check
          label="Show Mini-Location Bar"
          layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
index 9749b6fdd4..9aa2da5abd 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -5,7 +5,7 @@
  bg_opaque_color="MouseGray"
  follows="left|top|right"
  focus_root="true" 
- height="60"
+ height="34"
  layout="topleft"
  name="navigation_bar"
  chrome="true"
@@ -16,10 +16,10 @@
 	 mouse_opaque="false"
 	 name="bg_icon"
 	 scale_image="true"
-	 visible="true"
+	 visible="false"
 	 left="0"
 	 top="0"
-	 height="60"
+	 height="34"
 	 width="600"/>
 	<icon
 	 follows="all"
@@ -30,7 +30,7 @@
 	 visible="false"
 	 left="0"
 	 top="0"
-	 height="60"
+	 height="34"
 	 width="600"/>
 	<icon
 	 follows="all"
@@ -41,145 +41,176 @@
 	 visible="false"
 	 left="0"
 	 top="0"
-	 height="60"
+	 height="34"
 	 width="600"/>
-	<panel
-	 background_visible="false"
-	 follows="left|top|right"
-	 top="3"
-	 height="23"
-	 layout="topleft"
-	 name="navigation_panel"
-	 width="600">
-	     <pull_button
-	     follows="left|top"
-	     direction="down"
-	     height="23"
-	     image_overlay="Arrow_Left_Off"
-	     image_bottom_pad="1"
-	     layout="topleft"
-	     left="10"
-	     name="back_btn"
-	     tool_tip="Go back to previous location"
-	     top="2"
-	     width="31" />
-	    <pull_button
-	     follows="left|top"
-	     direction="down"
-	     height="23"
-	     image_overlay="Arrow_Right_Off"
-	     image_bottom_pad="1"
-	     layout="topleft"
-	     left_pad="0"
-	     name="forward_btn"
-	     tool_tip="Go forward one location"
-	     top_delta="0"
-	     width="31" />
-	    <button
-	     follows="left|top"
-	     height="23"
-	     image_bottom_pad="1"
-	     image_overlay="Home_Off"
-	     layout="topleft"
-	     left_pad="7"
-	     name="home_btn"
-	     tool_tip="Teleport to my home location"
-	     top_delta="0"
-	     width="32" />
-	    <location_input
-	     follows="left|right|top"
-	     halign="right"
-	     height="23"
-	     label="Location"
-	     layout="topleft"
-	     left_pad="7"
-	     max_chars="254"
-	     mouse_opaque="false"
-	     name="location_combo"
-	     top_delta="0"
-	     width="226">
-         <combo_list
-         mouse_wheel_opaque="true"/>
-	     <!-- *TODO: Delete.  Let the location_input use the correct art sizes.
-	        <location_input.add_landmark_button
-	         height="18"
-	         name="location_combo_add"
-	         width="20" />
-	        <location_input.info_button
-	         height="18"
-	         name="location_combo_info"
-	         width="20" />
-	      -->
-	    </location_input>
-	<!--     <button -->
-	<!--      follows="right|top" -->
-	<!--      height="20" -->
-	<!--      image_disabled="TextField_Search_Off" -->
-	<!--      image_disabled_selected="TextField_Search_Off" -->
-	<!--      image_hover_selected="TextField_Search_Off" -->
-	<!--      image_hover_unselected="TextField_Search_Off" -->
-	<!--      image_selected="TextField_Search_Off" -->
-	<!--      image_unselected="TextField_Search_Off" -->
-	<!--      layout="topleft" -->
-	<!--      left_pad="5" -->
-	<!--      mouse_opaque="false" -->
-	<!--      name="search_bg" -->
-	<!--      top_delta="0" -->
-	<!--      width="168" /> -->
-        <search_combo_box
-	     follows="right|top"
-	     halign="right"
-	     height="23"
-	     label="Search"
-	     layout="topleft"
-	     right="-10"
-	     mouse_opaque="false"
-	     name="search_combo_box"
-	     tool_tip="Search"
-	     top_delta="0"
-	     width="244" >
-         <combo_editor
-          label="Search [SECOND_LIFE]"
-          name="search_combo_editor"/>
-         <combo_list
-          draw_border="true"
-          border.highlight_light_color="FocusColor"
-          border.highlight_dark_color="FocusColor"
-          border.shadow_light_color="FocusColor"
-          border.shadow_dark_color="FocusColor"/>
-        </search_combo_box>
-	</panel>
-    <favorites_bar
-     follows="left|right|top"
-     font="SansSerifSmall"
-     height="15"
-     layout="topleft"
-     left="0"
-     name="favorite"
-     image_drag_indication="Accordion_ArrowOpened_Off"
-     bottom="55"
-     tool_tip="Drag Landmarks here for quick access to your favorite places in Second Life!"
-               width="590">
-        <label
-         follows="left|top"
-         height="15"
-         layout="topleft"
-         left="10"
-         name="favorites_bar_label"
-         text_color="LtGray"
-         tool_tip="Drag Landmarks here for quick access to your favorite places in Second Life!"
-         top="12"
-         width="102">
-          Favorites Bar
-        </label>
-    <chevron_button name=">>"
-                     image_unselected="TabIcon_Close_Off"
-                     image_selected="TabIcon_Close_Off"
-                     tab_stop="false"
-                     follows="left|bottom"
-                     tool_tip="Show more of My Favorites"
-                     width="15"
-		     top="15"
-                     height="15"/>
-  </favorites_bar>
+	 <layout_stack
+       use_border="true"
+       bevel_style="none"
+       follows="all"
+       height="34"
+       layout="topleft"
+       left="0"
+       mouse_opaque="false"
+       name="nvp_stack"
+       orientation="horizontal"
+       top="0"
+       width="600">
+         <layout_panel
+           follows="top|left"
+           layout="topleft"
+           auto_resize="true"
+           user_resize="true"
+           min_width="400"
+           name="navigation_layout_panel"
+           width="400">
+             <panel
+               background_visible="false"
+               follows="left|top|right"
+               top="3"
+               height="23"
+               layout="topleft"
+               left="0"
+               name="navigation_panel"
+               width="400">
+                 <pull_button
+                   follows="left|top"
+                   direction="down"
+                   height="23"
+                   image_overlay="Arrow_Left_Off"
+                   image_bottom_pad="1"
+                   layout="topleft"
+                   left="10"
+                   name="back_btn"
+                   tool_tip="Go back to previous location"
+                   top="2"
+                   width="31" />
+                 <pull_button
+                   follows="left|top"
+                   direction="down"
+                   height="23"
+                   image_overlay="Arrow_Right_Off"
+                   image_bottom_pad="1"
+                   layout="topleft"
+                   left_pad="0"
+                   name="forward_btn"
+                   tool_tip="Go forward one location"
+                   top_delta="0"
+                   width="31" />
+                 <button
+                   follows="left|top"
+                   height="23"
+                   image_bottom_pad="1"
+                   image_overlay="Home_Off"
+                   layout="topleft"
+                   left_pad="7"
+                   name="home_btn"
+                   tool_tip="Teleport to my home location"
+                   top_delta="0"
+                   width="32"/>
+                 <location_input
+                   follows="all"
+                   halign="right"
+                   height="23"
+                   label="Location"
+                   layout="topleft"
+                   left_pad="7"
+                   max_chars="254"
+                   mouse_opaque="false"
+                   name="location_combo"
+                   top_delta="0"
+                   width="113">
+                 <combo_list
+                   mouse_wheel_opaque="true"/>
+                 </location_input>
+                 <search_combo_box
+                   follows="top|right"
+                   halign="right"
+                   height="23"
+                   label="Search"
+                   layout="topleft"
+                   left_pad="7"
+                   mouse_opaque="false"
+                   name="search_combo_box"
+                   tool_tip="Search"
+                   top_delta="0"
+                   width="152" >
+                     <combo_editor
+                       label="Search [SECOND_LIFE]"
+                       name="search_combo_editor"/>
+                     <combo_list
+                       draw_border="true"
+                       border.highlight_light_color="FocusColor"
+                       border.highlight_dark_color="FocusColor"
+                       border.shadow_light_color="FocusColor"
+                       border.shadow_dark_color="FocusColor"
+                       mouse_wheel_opaque="true"/>
+                 </search_combo_box>
+             </panel>
+         </layout_panel>
+         
+         <layout_panel
+           auto_resize="false"
+           layout="topleft"
+           max_width="5"
+           min_width="5"
+           name="nav_bar_resize_handle_panel"
+           user_resize="false"
+           width="5">
+             <icon
+               follows="top|right"
+               height="25"
+               image_name="ChatBarHandle"
+               layout="topleft"
+               left="-6"
+               name="resize_handle"
+               top="4"
+               width="5" />
+         </layout_panel>
+         
+         <layout_panel
+           follows="top|left"
+           layout="topleft"
+           auto_resize="true"
+           user_resize="true"
+           min_width="190"
+           name="favorites_layout_panel"
+           width="190">
+             <favorites_bar
+               follows="left|right|top"
+               font="SansSerifSmall"
+               height="20"
+               layout="topleft"
+               left="0"
+               name="favorite"
+               image_drag_indication="Accordion_ArrowOpened_Off"
+               tool_tip="Drag Landmarks here for quick access to your favorite places in Second Life!"
+               width="190">
+                 <label
+                   follows="left|top"
+                   height="15"
+                   layout="topleft"
+                   left="10"
+                   name="favorites_bar_label"
+                   text_color="LtGray"
+                   tool_tip="Drag Landmarks here for quick access to your favorite places in Second Life!"
+                   top="12"
+                   width="102">
+                    Favorites Bar
+                 </label>
+                 <!-- More button actually is a text box. -->
+                 <more_button
+                   follows="left|bottom"
+                   font.name="SansSerifSmall"
+                   font.style="UNDERLINE"
+                   name=">>"
+                   tab_stop="false"
+                   tool_tip="Show more of My Favorites"
+                   top="15"
+                   width="50">
+                   More...
+                   </more_button>
+             </favorites_bar>
+         </layout_panel>
+     
+     </layout_stack>
 </panel>
-- 
cgit v1.2.3


From 64f30a302dfbcaf56502676fa4b8d8a06f355b40 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 20 Sep 2011 16:37:21 -0700
Subject: EXP-1228 FIX Create toolbar widget class that displays list of
 buttons horizontally or vertically buttons are now centered and sized
 according to content created floater_test_toolbar.xml to test

---
 .../skins/default/xui/en/floater_test_toolbar.xml  | 42 ++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/floater_test_toolbar.xml

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_test_toolbar.xml b/indra/newview/skins/default/xui/en/floater_test_toolbar.xml
new file mode 100644
index 0000000000..55cfd462ac
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_test_toolbar.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ can_resize="true"
+ height="500"
+ layout="topleft"
+ name="floater_test_toolbar"
+ translate="false"
+ width="500">
+  <toolbar name="test_toolbar_horizontal"
+           follows="left|right|top"
+           height="50"
+           width="500"
+           left="0"
+           top="20"
+           orientation="horizontal">
+    <button width="0"
+            auto_resize="true"
+            label="Button 1"/>
+    <button width="0"
+            auto_resize="true"
+            label="Button with long label"/>
+    <button width="0"
+            auto_resize="true"
+            label="Button with longest label of all"/>
+  </toolbar>
+  <toolbar name="test_toolbar_vertical"
+           follows="left|bottom|top"
+           height="430"
+           width="100"
+           left="0"
+           top="70"
+           orientation="vertical">
+    <button height="30"
+            label="Button 1"/>
+    <button height="50"
+            label="Button 2"/>
+    <button height="60"
+            label="Button 3"/>
+  </toolbar>
+
+</floater>
-- 
cgit v1.2.3


From bc3f0e0a81af79820a0c0a6877d266fca46ef917 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 20 Sep 2011 18:47:13 -0700
Subject: EXP-1230 FIX As a resident, I want to not have to choose a UI mode
 removed all references to basic mode

---
 .../skins/default/xui/en/menu_mode_change.xml      | 24 -------------------
 .../newview/skins/default/xui/en/notifications.xml | 13 -----------
 indra/newview/skins/default/xui/en/panel_login.xml | 27 ----------------------
 .../skins/default/xui/en/panel_status_bar.xml      | 19 ---------------
 4 files changed, 83 deletions(-)
 delete mode 100644 indra/newview/skins/default/xui/en/menu_mode_change.xml

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/menu_mode_change.xml b/indra/newview/skins/default/xui/en/menu_mode_change.xml
deleted file mode 100644
index 87d1a0a7a2..0000000000
--- a/indra/newview/skins/default/xui/en/menu_mode_change.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<toggleable_menu
- name="Mode Change">
-  <menu_item_check
-   label="Basic"
-   name="BasicMode">
-    <on_check
-         function="CheckSessionSettings"
-         parameter="settings_minimal.xml" />
-    <on_click
-      function="ChangeMode"
-      parameter="basic"/>
-  </menu_item_check>
-    <menu_item_check
-     label="Advanced"
-     name="AdvancedMode">
-    <on_check
-     function="CheckSessionSettings"
-     parameter="" />
-    <on_click
-      function="ChangeMode"
-      parameter="advanced"/>
-    </menu_item_check>
-  </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 41a90f5984..087744fea7 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -7382,19 +7382,6 @@ The site at &apos;&lt;nolink&gt;[HOST_NAME]&lt;/nolink&gt;&apos; in realm &apos;
     </form>
   </notification>
 
-  <notification
- name="ModeChange"
- label=""
- type="alertmodal">
-    <unique/>
-    Changing modes requires you to quit and restart.
-    <tag>confirm</tag>
-    <usetemplate
-   name="okcancelbuttons"
-   yestext="Quit"
-   notext="Don't Quit"/>
-    </notification>
-
   <notification
  name="NoClassifieds"
  label=""
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 1c3e08d59b..3835cd17b6 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -120,33 +120,6 @@ label="Remember password"
   follows="left|bottom"
   font="SansSerifSmall"
   height="15"
-  left_pad="10"
-  name="mode_selection_text"
-  top="20"
-  width="130">
-    Mode:
-  </text>
-  <combo_box
-    follows="left|bottom"
-  height="23"
-    max_chars="128"
-  tool_tip="Select your mode. Choose Basic for fast, easy exploration and chat. Choose Advanced to access more features."
-    top_pad="0"
-    name="mode_combo"
-    width="110">
-    <combo_box.item
-      label="Basic"
-      name="Basic"
-      value="settings_minimal.xml" />
-    <combo_box.item
-      label="Advanced"
-      name="Advanced"
-      value="" />
-  </combo_box>
-  <text
-  follows="left|bottom"
-  font="SansSerifSmall"
-  height="15"
   left_pad="8"
   name="start_location_text"
   top="20"
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 5894abd03b..3fb9aa0f3b 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -75,25 +75,6 @@
      top="0"
      width="55" />
   </panel>
-  <combo_box
-    follows="right|top"   
-    drop_down_button.pad_left="10" 
-    left_pad="5"
-    top="0"
-    width="120"
-    height="20"
-    name="mode_combo"
-    tool_tip="Select your mode. Choose Basic for fast, easy exploration and chat. Choose Advanced to access more features."
-    >
-    <combo_box.item
-      label="Basic Mode"
-      name="Basic"
-      value="settings_minimal.xml" />
-    <combo_box.item
-      label="Advanced Mode"
-      name="Advanced"
-      value="" />
-  </combo_box>
     <text
       left_pad="5"
      type="string"
-- 
cgit v1.2.3


From 8a846bd3747ac9192691b8b588bbae8d5e0de403 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 20 Sep 2011 19:02:11 -0700
Subject: EXP-1230 FIX As a resident, I want to not have to choose a UI mode
 cleaned up status and navigation bars

---
 indra/newview/skins/default/xui/en/panel_navigation_bar.xml |  4 ++--
 indra/newview/skins/default/xui/en/panel_status_bar.xml     | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
index 9749b6fdd4..8a7bd53054 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -97,7 +97,7 @@
 	     mouse_opaque="false"
 	     name="location_combo"
 	     top_delta="0"
-	     width="226">
+	     width="266">
          <combo_list
          mouse_wheel_opaque="true"/>
 	     <!-- *TODO: Delete.  Let the location_input use the correct art sizes.
@@ -137,7 +137,7 @@
 	     name="search_combo_box"
 	     tool_tip="Search"
 	     top_delta="0"
-	     width="244" >
+	     width="200" >
          <combo_editor
           label="Search [SECOND_LIFE]"
           name="search_combo_editor"/>
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 3fb9aa0f3b..cf684781b6 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -35,7 +35,7 @@
     </panel.string>
   <panel
     height="18"
-    left="-355"
+    left="-315"
     width="95"
     top="1"
     follows="right|top" 
@@ -76,18 +76,18 @@
      width="55" />
   </panel>
     <text
-      left_pad="5"
-     type="string"
+      type="string"
      font="SansSerifSmall"
      text_readonly_color="TimeTextColor"
      follows="right|top"
-     halign="center"
+     halign="right"
      height="16"
      top="5"
      layout="topleft"
+     left_pad="0"
      name="TimeText"
      tool_tip="Current time (Pacific)"
-     width="75">
+     width="145">
         24:00 AM PST
     </text>
     <button
@@ -98,7 +98,7 @@
      image_pressed="Pause_Press"
      image_pressed_selected="Play_Press"
      is_toggle="true"
-     left_pad="10"
+     left_pad="15"
      top="1"
      name="media_toggle_btn"
      tool_tip="Start/Stop All Media (Music, Video, Web pages)"
-- 
cgit v1.2.3


From 305b65f6f600b81de9a78e1246d2a5353cc3189b Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Wed, 21 Sep 2011 12:11:23 -0700
Subject: EXP-1205 PROGRESS -- As a User, I want a toybox which will contain
 all buttons that I can d&d into the toolbars EXP-1210 FIX -- Implement new
 toybox floater window EXP-1231 FIX -- Add menu option to toggle the toybox
 floater on and off

* Basic toybox floater implemented as its own class
* Toybox is available through "Me -> Toolbars..." menu option or ctrl-T shortcut
* Toolbars now have "side" type rather than simple orientation, as well as button
  state for "icons only" or "icons with text".

Reviewed by Richard
---
 .../skins/default/xui/en/floater_toybox.xml        | 63 ++++++++++++++++++++++
 indra/newview/skins/default/xui/en/menu_login.xml  |  2 +-
 indra/newview/skins/default/xui/en/menu_viewer.xml | 14 +++--
 3 files changed, 75 insertions(+), 4 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/floater_toybox.xml

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_toybox.xml b/indra/newview/skins/default/xui/en/floater_toybox.xml
new file mode 100644
index 0000000000..1951497309
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_toybox.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+  can_close="true"
+  can_dock="false"
+  can_minimize="false"
+  can_resize="false"
+  default_tab_group="1"
+  height="460"
+  help_topic="toybox"
+  layout="topleft"
+  legacy_header_height="18"
+  name="Toybox"
+  open_centered="true"
+  single_instance="true"
+  title="Customize toolbars"
+  width="658">
+  <text
+    follows="left|top"
+    font="SansSerifMedium"
+    halign="left"
+    height="20"
+    layout="topleft"
+    left="40"
+    length="1"
+    name="toybox label 1"
+    right="-40"
+    top="35"
+    type="string">
+      Add or remove buttons by dragging them to or from the toolbars.
+  </text>
+  <text
+    follows="left|top"
+    font="SansSerifMedium"
+    halign="left"
+    height="20"
+    layout="topleft"
+    left="40"
+    length="1"
+    name="toybox label 2"
+    right="-40"
+    top="55"
+    type="string">
+      Buttons will appear as shown or as icon-only depending on each toolbar's settings.
+  </text>
+  <toolbar
+    bottom="395"
+    left="40"
+    right="-40"
+    top="85">
+  </toolbar>
+  <button
+    follows="left|bottom"
+    height="23"
+    label="Restore defaults"
+    label_selected="Restore defaults"
+    layout="topleft"
+    left="40"
+    name="btn_restore_defaults"
+    top="415"
+    width="130">
+    <button.commit_callback function="Toybox.RestoreDefaults" />
+  </button>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml
index 4c4ff3e5c4..bb58dd500f 100644
--- a/indra/newview/skins/default/xui/en/menu_login.xml
+++ b/indra/newview/skins/default/xui/en/menu_login.xml
@@ -13,7 +13,7 @@
      tear_off="true"
      name="File">
         <menu_item_call
-         label="Preferences"
+         label="Preferences..."
          name="Preferences..."
          shortcut="control|P">
             <menu_item_call.on_click
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 36ebe73753..2e93243b0f 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -9,14 +9,22 @@
      name="Me"
      tear_off="true">
         <menu_item_call
-         label="Preferences"
+         label="Preferences..."
          name="Preferences"
          shortcut="control|P">
             <menu_item_call.on_click
              function="Floater.Show"
              parameter="preferences" />
         </menu_item_call>
-         <menu_item_call
+        <menu_item_call
+         label="Toolbars..."
+         name="Toolbars"
+         shortcut="control|T">
+            <menu_item_call.on_click
+             function="Floater.Toggle"
+             parameter="toybox" />
+        </menu_item_call>
+        <menu_item_call
              label="My Dashboard"
              name="Manage My Account">
                 <menu_item_call.on_click
@@ -2855,7 +2863,7 @@
                  function="ToggleControl"
                  parameter="BottomPanelNew" />
             </menu_item_check>-->
-            <menu_item_call
+          <menu_item_call
              label="Media Browser Test"
              name="Web Browser Test">
                 <menu_item_call.on_click
-- 
cgit v1.2.3


From 3dfc05c2e84923bc0aef5256d227f566aaa37868 Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Wed, 21 Sep 2011 13:51:59 -0700
Subject: Updating toolbar test floater to use new side definition rather than
 orientation

---
 indra/newview/skins/default/xui/en/floater_test_toolbar.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_test_toolbar.xml b/indra/newview/skins/default/xui/en/floater_test_toolbar.xml
index 55cfd462ac..76bba4e72e 100644
--- a/indra/newview/skins/default/xui/en/floater_test_toolbar.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_toolbar.xml
@@ -13,7 +13,7 @@
            width="500"
            left="0"
            top="20"
-           orientation="horizontal">
+           side="top">
     <button width="0"
             auto_resize="true"
             label="Button 1"/>
@@ -30,7 +30,7 @@
            width="100"
            left="0"
            top="70"
-           orientation="vertical">
+           side="left">
     <button height="30"
             label="Button 1"/>
     <button height="50"
-- 
cgit v1.2.3


From 7bc6e626f40a910b4a3e5b88161e96b9967bd24d Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Wed, 21 Sep 2011 14:24:38 -0700
Subject: EXP-1207 : LLToolbarView skeleton, nothing operational yet...

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

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml
index a7d1aa963c..54badb1386 100644
--- a/indra/newview/skins/default/xui/en/main_view.xml
+++ b/indra/newview/skins/default/xui/en/main_view.xml
@@ -162,6 +162,41 @@
                       top="0"
                       width="1024"/>
       </panel>
+	  
+      <panel follows="left|top"
+			layout="topleft"
+                    height="500"
+                    left="0"
+                    mouse_opaque="false"
+                    name="toolbar_view_holder"
+                    tab_stop="false"
+                    top="0"
+					visible="true"
+                    width="1024">
+        <toolbar_view follows="left|top"
+			layout="topleft"
+                      height="100"
+                      left="100"
+                      mouse_opaque="false"
+                      name="Toolbar View"
+                      tab_stop="false"
+                      top="100"
+					  visible="true"
+                      width="512">
+    <button
+     follows="left|top"
+     height="28"
+     image_selected="eye_button_active.tga"
+     image_unselected="eye_button_inactive.tga"
+     layout="topleft"
+			top="0"
+			left="0"
+     name="color_pipette"
+     width="28"
+	 visible="true" />
+					  </toolbar_view>
+      </panel>
+
     </layout_panel>
   </layout_stack>
   <panel mouse_opaque="false"
-- 
cgit v1.2.3


From 412e29ed9d62e975a5290c6008558a739b88065d Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Wed, 21 Sep 2011 17:25:38 -0700
Subject: EXP-1205 PROGRESS -- As a User, I want a toybox which will contain
 all buttons that I can d&d into the toolbars EXP-1232 FIX -- Create class to
 load and hold all of the command meta data associated with FUI toolbar
 actions

* Added basic commands.xml file to define FUI-related toolbar actions.  For now
  a basic "avatar" and "places" button are defined.
* Added basic command manager to parse and hold strings that define potential
  toolbar command actions.
* Broke out a separate floater function as a placeholder for the 3-state toolbar
  floater toggling.
* LLUI::initClass now parses the new commands.xml file

Reviewed by Richard.
---
 indra/newview/skins/default/xui/en/strings.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index c0154ae9b3..3b986664db 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3651,4 +3651,10 @@ Try enclosing path to the editor with double quotes.
   <string name="BeaconMedia">Viewing media beacons (white)</string>
   <string name="ParticleHiding">Hiding Particles</string>
 
-  </strings>
+  <!-- commands -->
+  <string name="Command_Avatar_Label">Avatar</string>
+  <string name="Command_Avatar_Tooltip">Customize your avatar</string>
+  <string name="Command_Places_Label">Places</string>
+  <string name="Command_Places_Tooltip">Destination guide</string>
+
+</strings>
-- 
cgit v1.2.3


From 7e308b551c7fde9178e354dba005a5b35f793245 Mon Sep 17 00:00:00 2001
From: Richard Nelson <richard@lindenlab.com>
Date: Wed, 21 Sep 2011 18:48:39 -0700
Subject: EXP-1239 WIP make toolbars wrap when there is not enough room initial
 pass at wrapping

---
 indra/newview/skins/default/xui/en/floater_test_toolbar.xml | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_test_toolbar.xml b/indra/newview/skins/default/xui/en/floater_test_toolbar.xml
index 55cfd462ac..138322eca7 100644
--- a/indra/newview/skins/default/xui/en/floater_test_toolbar.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_toolbar.xml
@@ -13,15 +13,12 @@
            width="500"
            left="0"
            top="20"
-           orientation="horizontal">
-    <button width="0"
-            auto_resize="true"
+           side="top">
+    <button auto_resize="true"
             label="Button 1"/>
-    <button width="0"
-            auto_resize="true"
+    <button auto_resize="true"
             label="Button with long label"/>
-    <button width="0"
-            auto_resize="true"
+    <button auto_resize="true"
             label="Button with longest label of all"/>
   </toolbar>
   <toolbar name="test_toolbar_vertical"
@@ -30,7 +27,7 @@
            width="100"
            left="0"
            top="70"
-           orientation="vertical">
+           side="left">
     <button height="30"
             label="Button 1"/>
     <button height="50"
-- 
cgit v1.2.3


From d9b96097cd67f1d72410c262973ac67fd0f82493 Mon Sep 17 00:00:00 2001
From: Richard Nelson <richard@lindenlab.com>
Date: Wed, 21 Sep 2011 18:48:51 -0700
Subject: EXP-1239 WIP make toolbars wrap when there is not enough room initial
 pass at wrapping

---
 indra/newview/skins/default/xui/en/widgets/toolbar.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/widgets/toolbar.xml

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/widgets/toolbar.xml b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
new file mode 100644
index 0000000000..a7f73c0c7c
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toolbar background_image = "Rounded_Rect">
+  <button_icon_and_text
+    follows="none"
+    height="30"
+    chrome="true"
+    auto_resize="true"
+    />
+  <button_icon
+  follows="none"
+  height="30"
+  chrome="true"
+  auto_resize="true"
+    />
+</toolbar>
-- 
cgit v1.2.3


From 65892a01cad5d22403f36a10187af40b37b48383 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Wed, 21 Sep 2011 19:31:07 -0700
Subject: EXP-1207 : More work on LLToolbarView, still not operational...

---
 indra/newview/skins/default/xui/en/main_view.xml   | 44 ++++-------------
 .../skins/default/xui/en/panel_toolbar_view.xml    | 55 ++++++++++++++++++++++
 2 files changed, 64 insertions(+), 35 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/panel_toolbar_view.xml

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml
index 54badb1386..a21c988bb8 100644
--- a/indra/newview/skins/default/xui/en/main_view.xml
+++ b/indra/newview/skins/default/xui/en/main_view.xml
@@ -162,41 +162,15 @@
                       top="0"
                       width="1024"/>
       </panel>
-	  
-      <panel follows="left|top"
-			layout="topleft"
-                    height="500"
-                    left="0"
-                    mouse_opaque="false"
-                    name="toolbar_view_holder"
-                    tab_stop="false"
-                    top="0"
-					visible="true"
-                    width="1024">
-        <toolbar_view follows="left|top"
-			layout="topleft"
-                      height="100"
-                      left="100"
-                      mouse_opaque="false"
-                      name="Toolbar View"
-                      tab_stop="false"
-                      top="100"
-					  visible="true"
-                      width="512">
-    <button
-     follows="left|top"
-     height="28"
-     image_selected="eye_button_active.tga"
-     image_unselected="eye_button_inactive.tga"
-     layout="topleft"
-			top="0"
-			left="0"
-     name="color_pipette"
-     width="28"
-	 visible="true" />
-					  </toolbar_view>
-      </panel>
-
+      <panel name="toolbar_view_holder"
+	    follows="all"
+		layout="topleft"
+        height="500"
+        width="1024"
+        top="0"
+        left="0"
+        mouse_opaque="false"
+        tab_stop="false"/>
     </layout_panel>
   </layout_stack>
   <panel mouse_opaque="false"
diff --git a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
new file mode 100644
index 0000000000..b58f8e837a
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<ui_ctrl
+ follows="all"
+ layout="topleft"
+ name="toolbar view"
+ height="500"
+ width="1024"
+ mouse_opaque="false"
+ tab_stop="false"
+ visible="true">
+ <toolbar
+  follows="top|bottom|left"
+  layout="topleft"
+  name="toolbar_left"
+  height="500"
+  width="30"
+  left="0"
+  top="0" 
+  button_display_mode="icons_only"
+  side="left"
+  visible="true" />
+ <toolbar
+  follows="right|bottom|left"
+  layout="topleft"
+  name="toolbar_bottom"
+  height="30"
+  width="964"
+  left="30"
+  top="470" 
+  button_display_mode="icons_with_text"
+  side="bottom"
+  visible="true" />
+ <toolbar
+  follows="top|bottom|right"
+  layout="topleft"
+  name="toolbar_right"
+  height="500"
+  width="30"
+  left="994"
+  top="0" 
+  button_display_mode="icons_only"
+  side="right"
+  visible="true" />
+ <button
+  follows="none"
+  name="test"
+  layout="topleft"
+  top="100"
+  left="100"
+  height="28"
+  width="28"
+  image_selected="eye_button_active.tga"
+  image_unselected="eye_button_inactive.tga"
+  visible="true" />
+</ui_ctrl>
-- 
cgit v1.2.3


From cdba1674c5293f5d55c059ada18eb1a1b75cf1e8 Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Thu, 22 Sep 2011 13:27:59 +0300
Subject: EXP-1203 ADDITIONAL FIX (As a FUI user, I want the address bar and
 favorites to be on one line)

- Changed member variable name mChevronButton to mMoreTextBox

- Fixed some bugs which PE testers have found:
          1. Parcel characteristics icons from location bar overlay other ui elements
          2. Navigation & Favorites bar are displayed after exitting mouselook mode although 'Show Navigation & Favorites bar' is unchecked
---
 .../skins/default/xui/en/panel_navigation_bar.xml        | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
index 9aa2da5abd..54befa38e9 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -9,7 +9,7 @@
  layout="topleft"
  name="navigation_bar"
  chrome="true"
- width="600">
+ width="800">
 	<icon
 	 follows="all"
 	 image_name="NavBar_BG"
@@ -54,15 +54,15 @@
        name="nvp_stack"
        orientation="horizontal"
        top="0"
-       width="600">
+       width="800">
          <layout_panel
            follows="top|left"
            layout="topleft"
            auto_resize="true"
            user_resize="true"
-           min_width="400"
+           min_width="500"
            name="navigation_layout_panel"
-           width="400">
+           width="500">
              <panel
                background_visible="false"
                follows="left|top|right"
@@ -71,7 +71,7 @@
                layout="topleft"
                left="0"
                name="navigation_panel"
-               width="400">
+               width="500">
                  <pull_button
                    follows="left|top"
                    direction="down"
@@ -118,7 +118,7 @@
                    mouse_opaque="false"
                    name="location_combo"
                    top_delta="0"
-                   width="113">
+                   width="213">
                  <combo_list
                    mouse_wheel_opaque="true"/>
                  </location_input>
@@ -174,7 +174,7 @@
            user_resize="true"
            min_width="190"
            name="favorites_layout_panel"
-           width="190">
+           width="290">
              <favorites_bar
                follows="left|right|top"
                font="SansSerifSmall"
@@ -184,7 +184,7 @@
                name="favorite"
                image_drag_indication="Accordion_ArrowOpened_Off"
                tool_tip="Drag Landmarks here for quick access to your favorite places in Second Life!"
-               width="190">
+               width="290">
                  <label
                    follows="left|top"
                    height="15"
-- 
cgit v1.2.3


From 0cd1988ef7f6f0b0330938fc44c7e35004114609 Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Thu, 22 Sep 2011 14:41:44 +0300
Subject: EXP-1223 FIXED (Create and register a floater for Places side tab)

- Added xml for a new floater and registred it in the floaterreg

- Removed side tray dependencies

- Added static helper method: LLFloaterSidePanelContainer::showPanel
---
 indra/newview/skins/default/xui/en/floater_places.xml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/floater_places.xml

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_places.xml b/indra/newview/skins/default/xui/en/floater_places.xml
new file mode 100644
index 0000000000..d589eb7d20
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_places.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<floater
+  legacy_header_height="18"
+  can_resize="true"
+  height="588"
+  layout="topleft"
+  name="floater_places"
+  save_rect="true"
+  title="PLACES"
+  width="333">
+    <panel
+      top="18"
+      class="panel_places"
+      name="main_panel"
+      filename="panel_places.xml"
+      label="Places"
+      font="SansSerifBold"/>
+</floater>
-- 
cgit v1.2.3


From 00f66ccf409b0f7fb974f23cd157cdd0b8a6ab96 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 22 Sep 2011 15:08:59 -0700
Subject: EXP-1239 WIP make toolbars wrap when there is not enough room added
 more toolbars to floater_test_toolbar.xml removed layout stack and got basic
 wrapping working reviewed by Leslie

---
 .../skins/default/xui/en/floater_test_toolbar.xml  | 47 ++++++++++++++++++----
 1 file changed, 39 insertions(+), 8 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_test_toolbar.xml b/indra/newview/skins/default/xui/en/floater_test_toolbar.xml
index 138322eca7..85f0f104fc 100644
--- a/indra/newview/skins/default/xui/en/floater_test_toolbar.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_toolbar.xml
@@ -7,33 +7,64 @@
  name="floater_test_toolbar"
  translate="false"
  width="500">
-  <toolbar name="test_toolbar_horizontal"
+  <toolbar name="test_toolbar_top"
            follows="left|right|top"
            height="50"
            width="500"
            left="0"
            top="20"
+           min_width="100"
            side="top">
     <button auto_resize="true"
-            label="Button 1"/>
+            label="Button"/>
     <button auto_resize="true"
             label="Button with long label"/>
     <button auto_resize="true"
             label="Button with longest label of all"/>
   </toolbar>
-  <toolbar name="test_toolbar_vertical"
+  <toolbar name="test_toolbar_left"
            follows="left|bottom|top"
-           height="430"
+           height="380"
            width="100"
            left="0"
            top="70"
+           min_width="100"           
            side="left">
     <button height="30"
-            label="Button 1"/>
+            label="Button"/>
     <button height="50"
-            label="Button 2"/>
+            label="Button with long label"/>
     <button height="60"
-            label="Button 3"/>
+            label="Button with longest label of all"/>
+  </toolbar>
+  <toolbar name="test_toolbar_right"
+           follows="right|bottom|top"
+           height="380"
+           width="100"
+           right="500"
+           top="70"
+           min_width="100"
+           side="right">
+    <button auto_resize="true"
+            label="Button 1"/>
+    <button auto_resize="true"
+            label="Button with long label"/>
+    <button auto_resize="true"
+            label="Button with longest label of all"/>
+  </toolbar>
+  <toolbar name="test_toolbar_bottom"
+           follows="left|right|bottom"
+           height="50"
+           width="500"
+           left="0"
+           bottom="500"
+           min_width="100"
+           side="bottom">
+    <button auto_resize="true"
+            label="Button"/>
+    <button auto_resize="true"
+            label="Button with long label"/>
+    <button auto_resize="true"
+            label="Button with longest label of all"/>
   </toolbar>
-
 </floater>
-- 
cgit v1.2.3


From 565483ee1f2ea7b8d525c6d89700452216481c5e Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Thu, 22 Sep 2011 15:43:08 -0700
Subject: EXP-1205 PROGRESS -- As a User, I want a toybox which will contain
 all buttons that I can d&d into the toolbars EXP-1233 PROGRESS -- Populate
 the toybox floater window with all FUI toolbar buttons EXP-1236 FIX -- The
 toybox floater should remember its position for the user

* Basic addCommand function to the LLToolBar.  Need proper implementation.
* Added map for faster lookup of commands
* Toybox now adds commands to its toolbar for basic button setup

Reviewed by Richard.
---
 indra/newview/skins/default/xui/en/floater_toybox.xml | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_toybox.xml b/indra/newview/skins/default/xui/en/floater_toybox.xml
index 1951497309..5f3a59d964 100644
--- a/indra/newview/skins/default/xui/en/floater_toybox.xml
+++ b/indra/newview/skins/default/xui/en/floater_toybox.xml
@@ -11,6 +11,7 @@
   legacy_header_height="18"
   name="Toybox"
   open_centered="true"
+  save_rect="true"
   single_instance="true"
   title="Customize toolbars"
   width="658">
@@ -45,7 +46,11 @@
   <toolbar
     bottom="395"
     left="40"
+    max_button_width="140"
+    min_button_width="140"
+    name="toybox_toolbar"
     right="-40"
+    side="top"
     top="85">
   </toolbar>
   <button
-- 
cgit v1.2.3


From c155483fc206768e21d180fac9ccdd85db8f582e Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 22 Sep 2011 17:34:42 -0700
Subject: EXP-1239 WIP make toolbars wrap when there is not enough room toolbar
 button height configured by button_height attribute vertical toolbar buttons
 now share common width wrap attribute now controls wrapping

---
 .../skins/default/xui/en/floater_test_toolbar.xml  | 10 ++++++----
 .../skins/default/xui/en/widgets/toolbar.xml       | 23 ++++++++++------------
 2 files changed, 16 insertions(+), 17 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_test_toolbar.xml b/indra/newview/skins/default/xui/en/floater_test_toolbar.xml
index 85f0f104fc..da964b88e2 100644
--- a/indra/newview/skins/default/xui/en/floater_test_toolbar.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_toolbar.xml
@@ -13,13 +13,16 @@
            width="500"
            left="0"
            top="20"
-           min_width="100"
+           min_button_width="0"
+           max_button_width="100"
            side="top">
     <button auto_resize="true"
+            use_ellipses="true"
             label="Button"/>
     <button auto_resize="true"
             label="Button with long label"/>
     <button auto_resize="true"
+            use_ellipses="true"
             label="Button with longest label of all"/>
   </toolbar>
   <toolbar name="test_toolbar_left"
@@ -28,7 +31,7 @@
            width="100"
            left="0"
            top="70"
-           min_width="100"           
+           min_button_width="100"           
            side="left">
     <button height="30"
             label="Button"/>
@@ -43,7 +46,6 @@
            width="100"
            right="500"
            top="70"
-           min_width="100"
            side="right">
     <button auto_resize="true"
             label="Button 1"/>
@@ -58,7 +60,7 @@
            width="500"
            left="0"
            bottom="500"
-           min_width="100"
+           min_button_width="100"
            side="bottom">
     <button auto_resize="true"
             label="Button"/>
diff --git a/indra/newview/skins/default/xui/en/widgets/toolbar.xml b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
index a7f73c0c7c..f9cc9b7c69 100644
--- a/indra/newview/skins/default/xui/en/widgets/toolbar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<toolbar background_image = "Rounded_Rect">
-  <button_icon_and_text
-    follows="none"
-    height="30"
-    chrome="true"
-    auto_resize="true"
-    />
-  <button_icon
-  follows="none"
-  height="30"
-  chrome="true"
-  auto_resize="true"
-    />
+<toolbar background_image = "Rounded_Rect"
+         button_height="30">
+  <button_icon_and_text follows="none"
+                        chrome="true"
+                        use_ellipses="true"
+                        auto_resize="true"/>
+  <button_icon follows="none"
+               chrome="true"
+               use_ellipses="true"
+               auto_resize="true"/>
 </toolbar>
-- 
cgit v1.2.3


From 53a8e1299305a4acad83f52401679c86485fcf51 Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Fri, 23 Sep 2011 09:45:28 -0700
Subject: EXP-1205 PROGRESS -- As a User, I want a toybox which will contain
 all buttons that I can d&d into the toolbars EXP-1233 PROGRESS -- Populate
 the toybox floater window with all FUI toolbar buttons

* Added all documented FUI commands from the wiki, 20 in all, with text,
  tooltips and placeholder icons.
* Note current toolbar checked in toolbar code does not lay these commands out
  properly.
---
 indra/newview/skins/default/xui/en/strings.xml | 38 +++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 3b986664db..d4c2bc50ca 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3653,8 +3653,44 @@ Try enclosing path to the editor with double quotes.
 
   <!-- commands -->
   <string name="Command_Avatar_Label">Avatar</string>
-  <string name="Command_Avatar_Tooltip">Customize your avatar</string>
+  <string name="Command_Avatar_Tooltip">Change the appearance of your avatar</string>
+  <string name="Command_Build_Label">Build</string>
+  <string name="Command_Build_Tooltip">Building, reshaping terrain</string>
+  <string name="Command_Chat_Label">Chat</string>
+  <string name="Command_Chat_Tooltip">Chat with people nearby</string>
+  <string name="Command_Compass_Label">Compass</string>
+  <string name="Command_Compass_Tooltip"></string>
+  <string name="Command_Gestures_Label">Gestures</string>
+  <string name="Command_Gestures_Tooltip"></string>
+  <string name="Command_HowTo_Label">How To</string>
+  <string name="Command_HowTo_Tooltip"></string>
+  <string name="Command_Landmarks_Label">Landmarks</string>
+  <string name="Command_Landmarks_Tooltip"></string>
+  <string name="Command_Map_Label">Map</string>
+  <string name="Command_Map_Tooltip"></string>
+  <string name="Command_Move_Label">Move</string>
+  <string name="Command_Move_Tooltip"></string>
+  <string name="Command_MyLand_Label">My Land</string>
+  <string name="Command_MyLand_Tooltip">Information about the land you're visiting</string>
+  <string name="Command_MyStuff_Label">My Stuff</string>
+  <string name="Command_MyStuff_Tooltip">View and use your belongings</string>
+  <string name="Command_People_Label">People</string>
+  <string name="Command_People_Tooltip"></string>
   <string name="Command_Places_Label">Places</string>
   <string name="Command_Places_Tooltip">Destination guide</string>
+  <string name="Command_Search_Label">Search</string>
+  <string name="Command_Search_Tooltip">Find...</string>
+  <string name="Command_Settings_Label">Settings</string>
+  <string name="Command_Settings_Tooltip">Preferences</string>
+  <string name="Command_Shop_Label">Shop</string>
+  <string name="Command_Shop_Tooltip"></string>
+  <string name="Command_Snapshot_Label">Snapshot</string>
+  <string name="Command_Snapshot_Tooltip">Take a picture</string>
+  <string name="Command_Speak_Label">Speak</string>
+  <string name="Command_Speak_Tooltip">Speak with people nearby using your microphone</string>
+  <string name="Command_Upload_Label">Upload</string>
+  <string name="Command_Upload_Tooltip"></string>
+  <string name="Command_View_Label">View</string>
+  <string name="Command_View_Tooltip">Changing your view of the world</string>
 
 </strings>
-- 
cgit v1.2.3


From 1bcf6882c5faa94385f045e1c591da96408bb032 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Fri, 23 Sep 2011 15:09:37 -0700
Subject: EXP-1207 : More on lltoolbarview. Still not rendering

---
 indra/newview/skins/default/xui/en/main_view.xml   |  3 ++-
 .../skins/default/xui/en/panel_toolbar_view.xml    | 28 +++++++++++-----------
 2 files changed, 16 insertions(+), 15 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml
index a21c988bb8..448f10a93c 100644
--- a/indra/newview/skins/default/xui/en/main_view.xml
+++ b/indra/newview/skins/default/xui/en/main_view.xml
@@ -170,7 +170,8 @@
         top="0"
         left="0"
         mouse_opaque="false"
-        tab_stop="false"/>
+        tab_stop="false">
+       </panel>
     </layout_panel>
   </layout_stack>
   <panel mouse_opaque="false"
diff --git a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
index b58f8e837a..33a19bcdb0 100644
--- a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
+++ b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<ui_ctrl
+<toolbar_view
  follows="all"
  layout="topleft"
  name="toolbar view"
@@ -16,7 +16,6 @@
   width="30"
   left="0"
   top="0" 
-  button_display_mode="icons_only"
   side="left"
   visible="true" />
  <toolbar
@@ -27,7 +26,6 @@
   width="964"
   left="30"
   top="470" 
-  button_display_mode="icons_with_text"
   side="bottom"
   visible="true" />
  <toolbar
@@ -38,18 +36,20 @@
   width="30"
   left="994"
   top="0" 
-  button_display_mode="icons_only"
   side="right"
   visible="true" />
- <button
-  follows="none"
-  name="test"
+ <panel
+  follows="right|bottom|left"
   layout="topleft"
-  top="100"
-  left="100"
-  height="28"
-  width="28"
-  image_selected="eye_button_active.tga"
-  image_unselected="eye_button_inactive.tga"
+  name="sizer_left"
+  height="500"
+  width="30"
+  left="0"
+  top="0" 
+  background_opaque="false"
+  border_visible="false"
+  background_visible="true"
+  bg_opaque_image="Toast_Over"
+  bg_alpha_image="Toast_Background"
   visible="true" />
-</ui_ctrl>
+</toolbar_view>
-- 
cgit v1.2.3


From b6d7f99f065c87f7409a1e5e1ba1b59f3f4a3efb Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Fri, 23 Sep 2011 17:01:15 -0700
Subject: EXP-1239 FIX make toolbars wrap when there is not enough room spacing
 between buttons now configurable and correct background art now wraps buttons
 correctly created customizable panel for button background

---
 .../skins/default/xui/en/floater_test_toolbar.xml       |  4 ++--
 indra/newview/skins/default/xui/en/widgets/toolbar.xml  | 17 +++++++++++++----
 2 files changed, 15 insertions(+), 6 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_test_toolbar.xml b/indra/newview/skins/default/xui/en/floater_test_toolbar.xml
index da964b88e2..b58c006b3f 100644
--- a/indra/newview/skins/default/xui/en/floater_test_toolbar.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_toolbar.xml
@@ -28,7 +28,7 @@
   <toolbar name="test_toolbar_left"
            follows="left|bottom|top"
            height="380"
-           width="100"
+           width="200"
            left="0"
            top="70"
            min_button_width="100"           
@@ -43,7 +43,7 @@
   <toolbar name="test_toolbar_right"
            follows="right|bottom|top"
            height="380"
-           width="100"
+           width="200"
            right="500"
            top="70"
            side="right">
diff --git a/indra/newview/skins/default/xui/en/widgets/toolbar.xml b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
index f9cc9b7c69..45210277b2 100644
--- a/indra/newview/skins/default/xui/en/widgets/toolbar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
@@ -1,11 +1,20 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<toolbar background_image = "Rounded_Rect"
-         button_height="30">
-  <button_icon_and_text follows="none"
+<toolbar button_height="30"
+         pad_left="5"
+         pad_right="5"
+         pad_top="5"
+         pad_bottom="5"
+         pad_between="5">
+
+  <button_panel name="button_panel"
+                bg_opaque_image="Rounded_Rect"
+                background_visible="true"
+                background_opaque="true"/>
+  <button_icon_and_text follows="left|top"
                         chrome="true"
                         use_ellipses="true"
                         auto_resize="true"/>
-  <button_icon follows="none"
+  <button_icon follows="left|top"
                chrome="true"
                use_ellipses="true"
                auto_resize="true"/>
-- 
cgit v1.2.3


From 105b15436d37149f6df71866125871448ee4fbcb Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Fri, 23 Sep 2011 19:24:55 -0700
Subject: EXP-1027 : Fix the children creation code in LLToolBarView. Only a
 left panel is displayed now.

---
 indra/newview/skins/default/xui/en/panel_toolbar_view.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
index 33a19bcdb0..12c442d8f1 100644
--- a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
+++ b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
@@ -5,6 +5,8 @@
  name="toolbar view"
  height="500"
  width="1024"
+ left="0"
+ top="0" 
  mouse_opaque="false"
  tab_stop="false"
  visible="true">
@@ -39,7 +41,7 @@
   side="right"
   visible="true" />
  <panel
-  follows="right|bottom|left"
+  follows="top|bottom|left"
   layout="topleft"
   name="sizer_left"
   height="500"
-- 
cgit v1.2.3


From a80d5f2b46b21a8d1a48da4b4d2c740cb8260928 Mon Sep 17 00:00:00 2001
From: Seth ProductEngine <slitovchuk@productengine.com>
Date: Mon, 26 Sep 2011 15:21:46 +0300
Subject: EXP-1222 FIXED Added a floater for My Profile side tab. - Replaced
 calls to LLSideTray with LLFloaterSidePanelContainer. - Removed obsolete code
 implementing the tri-state behavior of Profile side panel. - Added People
 panel XUI which is referenced from Profile panel.

---
 .../skins/default/xui/en/floater_my_profile.xml    | 19 ++++++++++
 .../skins/default/xui/en/floater_people.xml        | 41 ++++++++++++++++++++++
 2 files changed, 60 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/floater_my_profile.xml
 create mode 100644 indra/newview/skins/default/xui/en/floater_people.xml

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_my_profile.xml b/indra/newview/skins/default/xui/en/floater_my_profile.xml
new file mode 100644
index 0000000000..b3ebe7f791
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_my_profile.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<floater
+ can_close="true"
+ can_resize="true"
+ height="570"
+ help_topic="sidebar_me"
+ min_width="333"
+ min_height="440"
+ name="floater_profile"
+ save_rect="true"
+ save_visibility="true"
+ title="My Profile"
+ width="333" >
+   <panel
+    class="panel_me"
+    name="main_panel"
+    filename="panel_me.xml"
+    follows="all"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_people.xml b/indra/newview/skins/default/xui/en/floater_people.xml
new file mode 100644
index 0000000000..13e0738e52
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_people.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<floater
+ can_close="true"
+ can_resize="true"
+ height="570"
+ help_topic="sidebar_people"
+ min_width="333"
+ min_height="440"
+ name="floater_people"
+ save_rect="true"
+ save_visibility="true"
+ title="People"
+ width="333" >
+    <panel_container
+      follows="all"
+      height="570"
+      name="main_panel"
+      default_panel_name="panel_people"
+      width="333">
+      <panel
+        class="panel_people"
+        name="panel_people"
+        filename="panel_people.xml"/>
+      <panel
+        class="panel_profile_view"
+        name="panel_profile_view"
+        filename="panel_profile_view.xml"/>
+      <panel
+        class="panel_group_info_sidetray"
+        name="panel_group_info_sidetray"
+        filename="panel_group_info_sidetray.xml"
+        label="Group Profile"
+        font="SansSerifBold"/>
+      <panel
+        class="panel_block_list_sidetray"
+        name="panel_block_list_sidetray"
+        filename="panel_block_list_sidetray.xml"
+        label="Blocked Residents &amp; Objects"
+        font="SansSerifBold"/>
+    </panel_container>
+</floater>
-- 
cgit v1.2.3


From 679a028fcc5615b9725bf11f6949634617fad06d Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Mon, 26 Sep 2011 20:37:02 +0300
Subject: EXP-1203 ADDITIONAL FIX (As a FUI user, I want the address bar and
 favorites to be on one line)

- Removed search combobox by spec

- Fixed EXP-1243 (Parcel characteristics icons from location bar overlay other ui elements)

- Fixed EXP-1245 (More spillover list "jumps" on copying landmarks)
---
 .../skins/default/xui/en/panel_navigation_bar.xml  | 37 ++++------------------
 1 file changed, 7 insertions(+), 30 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
index 54befa38e9..719d3531ed 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -60,9 +60,9 @@
            layout="topleft"
            auto_resize="true"
            user_resize="true"
-           min_width="500"
+           min_width="340"
            name="navigation_layout_panel"
-           width="500">
+           width="340">
              <panel
                background_visible="false"
                follows="left|top|right"
@@ -71,7 +71,7 @@
                layout="topleft"
                left="0"
                name="navigation_panel"
-               width="500">
+               width="340">
                  <pull_button
                    follows="left|top"
                    direction="down"
@@ -118,33 +118,10 @@
                    mouse_opaque="false"
                    name="location_combo"
                    top_delta="0"
-                   width="213">
+                   width="215">
                  <combo_list
                    mouse_wheel_opaque="true"/>
                  </location_input>
-                 <search_combo_box
-                   follows="top|right"
-                   halign="right"
-                   height="23"
-                   label="Search"
-                   layout="topleft"
-                   left_pad="7"
-                   mouse_opaque="false"
-                   name="search_combo_box"
-                   tool_tip="Search"
-                   top_delta="0"
-                   width="152" >
-                     <combo_editor
-                       label="Search [SECOND_LIFE]"
-                       name="search_combo_editor"/>
-                     <combo_list
-                       draw_border="true"
-                       border.highlight_light_color="FocusColor"
-                       border.highlight_dark_color="FocusColor"
-                       border.shadow_light_color="FocusColor"
-                       border.shadow_dark_color="FocusColor"
-                       mouse_wheel_opaque="true"/>
-                 </search_combo_box>
              </panel>
          </layout_panel>
          
@@ -172,9 +149,9 @@
            layout="topleft"
            auto_resize="true"
            user_resize="true"
-           min_width="190"
+           min_width="335"
            name="favorites_layout_panel"
-           width="290">
+           width="335">
              <favorites_bar
                follows="left|right|top"
                font="SansSerifSmall"
@@ -184,7 +161,7 @@
                name="favorite"
                image_drag_indication="Accordion_ArrowOpened_Off"
                tool_tip="Drag Landmarks here for quick access to your favorite places in Second Life!"
-               width="290">
+               width="331">
                  <label
                    follows="left|top"
                    height="15"
-- 
cgit v1.2.3


From 16fead6429eba35bdfb8ef01610780a508e062df Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Mon, 26 Sep 2011 11:19:30 -0700
Subject: EXP-1207 : add button display mode mandatory param to toolbars

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

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
index 12c442d8f1..6701266887 100644
--- a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
+++ b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
@@ -19,6 +19,7 @@
   left="0"
   top="0" 
   side="left"
+  button_display_mode="icons_only"
   visible="true" />
  <toolbar
   follows="right|bottom|left"
@@ -29,6 +30,7 @@
   left="30"
   top="470" 
   side="bottom"
+  button_display_mode="icons_with_text"
   visible="true" />
  <toolbar
   follows="top|bottom|right"
@@ -39,6 +41,7 @@
   left="994"
   top="0" 
   side="right"
+  button_display_mode="icons_only"
   visible="true" />
  <panel
   follows="top|bottom|left"
-- 
cgit v1.2.3


From 9da5a8d01085f13c0586bba4c818ed540335ae2e Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Mon, 26 Sep 2011 14:34:42 -0700
Subject: EXP-1205 PROGRESS -- As a User, I want a toybox which will contain
 all buttons that I can d&d into the toolbars EXP-1233 PROGRESS -- Populate
 the toybox floater window with all FUI toolbar buttons EXP-1235 FIX -- Make
 the toybox available through the context menus associated with the other
 toolbars EXP-1248 FIX -- Implement context menu on toolbars

* New commands are listed
* Toolbars can now be made read-only (as in the toybox) or editable (as in the others)
* Toolbars that are not read-only have a context menu that allows button type editing.

Reviewed by Richard.
---
 .../skins/default/xui/en/floater_toybox.xml        |  4 ++-
 .../newview/skins/default/xui/en/menu_toolbars.xml | 29 ++++++++++++++++++++++
 indra/newview/skins/default/xui/en/strings.xml     |  2 ++
 .../skins/default/xui/en/widgets/toolbar.xml       |  3 ++-
 4 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/menu_toolbars.xml

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_toybox.xml b/indra/newview/skins/default/xui/en/floater_toybox.xml
index 5f3a59d964..1c9f20c496 100644
--- a/indra/newview/skins/default/xui/en/floater_toybox.xml
+++ b/indra/newview/skins/default/xui/en/floater_toybox.xml
@@ -45,10 +45,12 @@
   </text>
   <toolbar
     bottom="395"
+    button_display_mode="icons_with_text"
     left="40"
     max_button_width="140"
-    min_button_width="140"
+    min_button_width="70"
     name="toybox_toolbar"
+    read_only="true"
     right="-40"
     side="top"
     top="85">
diff --git a/indra/newview/skins/default/xui/en/menu_toolbars.xml b/indra/newview/skins/default/xui/en/menu_toolbars.xml
new file mode 100644
index 0000000000..b3ecd3dcb6
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_toolbars.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu bottom="825"
+      layout="topleft"
+      name="Toolbars Popup"
+      visible="false">
+  <menu_item_call label="Choose buttons..."
+                  layout="topleft"
+                  name="Chose Buttons">
+    <menu_item_call.on_click function="Floater.Show"
+                             parameter="toybox" />
+  </menu_item_call>
+  <menu_item_separator layout="topleft" />
+  <menu_item_check label="Icons and labels"
+                   layout="topleft"
+                   name="icons_and_labels">
+    <on_click function="Toolbars.EnableSetting"
+              parameter="icons_and_labels" />
+    <on_check function="Toolbars.CheckSetting"
+              parameter="icons_and_labels" />
+  </menu_item_check>
+  <menu_item_check label="Icons only"
+                   layout="topleft"
+                   name="icons_only">
+    <on_click function="Toolbars.EnableSetting"
+              parameter="icons_only" />
+    <on_check function="Toolbars.CheckSetting"
+              parameter="icons_only" />
+  </menu_item_check>
+</menu>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index d4c2bc50ca..feea555fdc 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3668,6 +3668,8 @@ Try enclosing path to the editor with double quotes.
   <string name="Command_Landmarks_Tooltip"></string>
   <string name="Command_Map_Label">Map</string>
   <string name="Command_Map_Tooltip"></string>
+  <string name="Command_MiniMap_Label">Mini Map</string>
+  <string name="Command_MiniMap_Tooltip"></string>
   <string name="Command_Move_Label">Move</string>
   <string name="Command_Move_Tooltip"></string>
   <string name="Command_MyLand_Label">My Land</string>
diff --git a/indra/newview/skins/default/xui/en/widgets/toolbar.xml b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
index 45210277b2..7346e5ce2d 100644
--- a/indra/newview/skins/default/xui/en/widgets/toolbar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
@@ -4,7 +4,8 @@
          pad_right="5"
          pad_top="5"
          pad_bottom="5"
-         pad_between="5">
+         pad_between="5"
+         read_only="false">
 
   <button_panel name="button_panel"
                 bg_opaque_image="Rounded_Rect"
-- 
cgit v1.2.3


From e3199b98be55c7d3355258e836b6cab522922cfa Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Mon, 26 Sep 2011 15:19:04 -0700
Subject: EXP-1207 : Display toolbars only after login, use correct position
 (temporary), follow resize correctly, store pointers to toolbars, debug
 display (temporary)

---
 .../skins/default/xui/en/panel_toolbar_view.xml    | 40 +++++++++++-----------
 1 file changed, 20 insertions(+), 20 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
index 6701266887..7503da1d36 100644
--- a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
+++ b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
@@ -3,18 +3,32 @@
  follows="all"
  layout="topleft"
  name="toolbar view"
- height="500"
+ height="716"
  width="1024"
  left="0"
  top="0" 
  mouse_opaque="false"
  tab_stop="false"
  visible="true">
+ <panel
+  follows="top|bottom|left"
+  layout="topleft"
+  name="sizer_left"
+  height="686"
+  width="30"
+  left="0"
+  top="0" 
+  background_opaque="false"
+  border_visible="false"
+  background_visible="true"
+  bg_opaque_image="Toast_Over"
+  bg_alpha_image="Toast_Background"
+  visible="true" />
  <toolbar
   follows="top|bottom|left"
   layout="topleft"
   name="toolbar_left"
-  height="500"
+  height="686"
   width="30"
   left="0"
   top="0" 
@@ -26,9 +40,9 @@
   layout="topleft"
   name="toolbar_bottom"
   height="30"
-  width="964"
-  left="30"
-  top="470" 
+  width="1024"
+  left="0"
+  top="686" 
   side="bottom"
   button_display_mode="icons_with_text"
   visible="true" />
@@ -36,25 +50,11 @@
   follows="top|bottom|right"
   layout="topleft"
   name="toolbar_right"
-  height="500"
+  height="686"
   width="30"
   left="994"
   top="0" 
   side="right"
   button_display_mode="icons_only"
   visible="true" />
- <panel
-  follows="top|bottom|left"
-  layout="topleft"
-  name="sizer_left"
-  height="500"
-  width="30"
-  left="0"
-  top="0" 
-  background_opaque="false"
-  border_visible="false"
-  background_visible="true"
-  bg_opaque_image="Toast_Over"
-  bg_alpha_image="Toast_Background"
-  visible="true" />
 </toolbar_view>
-- 
cgit v1.2.3


From a465f816b8e7674aa3f22023d7708106ca35b350 Mon Sep 17 00:00:00 2001
From: Richard Nelson <richard@lindenlab.com>
Date: Mon, 26 Sep 2011 17:36:07 -0700
Subject: EXP-1239 FIX make toolbars wrap when there is not enough room
 toolbars resize to fit buttons toolbar view uses layout stacks to organize
 toolbars reviewed by Leslie

---
 .../skins/default/xui/en/panel_toolbar_view.xml    | 146 ++++++++++++++-------
 .../skins/default/xui/en/widgets/toolbar.xml       |   3 +-
 2 files changed, 101 insertions(+), 48 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
index 6701266887..b24f5c3347 100644
--- a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
+++ b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
@@ -10,51 +10,103 @@
  mouse_opaque="false"
  tab_stop="false"
  visible="true">
- <toolbar
-  follows="top|bottom|left"
-  layout="topleft"
-  name="toolbar_left"
-  height="500"
-  width="30"
-  left="0"
-  top="0" 
-  side="left"
-  button_display_mode="icons_only"
-  visible="true" />
- <toolbar
-  follows="right|bottom|left"
-  layout="topleft"
-  name="toolbar_bottom"
-  height="30"
-  width="964"
-  left="30"
-  top="470" 
-  side="bottom"
-  button_display_mode="icons_with_text"
-  visible="true" />
- <toolbar
-  follows="top|bottom|right"
-  layout="topleft"
-  name="toolbar_right"
-  height="500"
-  width="30"
-  left="994"
-  top="0" 
-  side="right"
-  button_display_mode="icons_only"
-  visible="true" />
- <panel
-  follows="top|bottom|left"
-  layout="topleft"
-  name="sizer_left"
-  height="500"
-  width="30"
-  left="0"
-  top="0" 
-  background_opaque="false"
-  border_visible="false"
-  background_visible="true"
-  bg_opaque_image="Toast_Over"
-  bg_alpha_image="Toast_Background"
-  visible="true" />
+  <layout_stack name="bottom_toolbar_stack"
+                orientation="vertical"
+                left="0"
+                top="0"
+                width="1024"
+                height="500"
+                follows="all"
+                mouse_opaque="false">
+  <layout_panel name="vertical_toolbar_panel"
+                auto_resize="true"
+                user_resize="false"
+                width="1024"
+                height="500"
+                mouse_opaque="false">
+    <layout_stack name="vertical_toolbar_stack"
+                  orientation="horizontal"
+                  left="0"
+                  top="0"
+                  width="1024"
+                  height="500"
+                  follows="all"
+                  mouse_opaque="false">
+      <layout_panel name="left_toolbar_panel"
+                    fit_content="true"
+                    auto_resize="false"
+                    user_resize="false"
+                    height="500"
+                    width="30"
+                    mouse_opaque="false">
+        <toolbar follows="left|top|bottom"
+                 name="toolbar_left"
+                 height="500"
+                 width="30"
+                 left="0"
+                 top="0"
+                 side="left"
+                 button_display_mode="icons_only">
+          <button name="button1" label="Left Toolbar"/>
+          <button name="button2" label="Left Toolbar"/>
+          <button name="button3" label="Left Toolbar"/>
+          <button name="button4" label="Left Toolbar"/>
+          <button name="button5" label="Left Toolbar"/>
+        </toolbar>
+      </layout_panel>
+      <layout_panel name="non_toolbar_panel"
+                    auto_resize="true"
+                    user_resize="false"
+                    mouse_opaque="false"/>
+      <layout_panel name="right_toolbar_panel"
+                    fit_content="true"
+                    auto_resize="false"
+                    user_resize="false"
+                    height="500"
+                    width="30"
+                    mouse_opaque="false">
+        <toolbar
+          follows="right|top|bottom"
+          name="toolbar_right"
+          height="500"
+          width="30"
+          left="0"
+          top="0"
+          side="right"
+          button_display_mode="icons_only">
+          <button name="button1" label="Right Toolbar"/>
+          <button name="button2" label="Right Toolbar"/>
+          <button name="button3" label="Right Toolbar"/>
+          <button name="button4" label="Right Toolbar"/>
+          <button name="button5" label="Right Toolbar"/>
+        </toolbar>
+      </layout_panel>
+    </layout_stack>
+  </layout_panel>
+  <layout_panel name="bottom_toolbar_panel"
+                fit_content="true"
+                auto_resize="false"
+                user_resize="false"
+                height="30"
+                width="1024"
+                mouse_opaque="false">
+    <toolbar layout="topleft"
+             name="toolbar_bottom"
+             height="30"
+             width="1024"
+             left="0"
+             top="0"
+             side="bottom"
+             follows="left|right|bottom"
+             button_display_mode="icons_with_text"
+             visible="true">
+      <button name="button1" label="Bottom toolbar"/>
+      <button name="button2" label="Bottom toolbar"/>
+      <button name="button3" label="Bottom toolbar"/>
+      <button name="button4" label="Bottom toolbar"/>
+      <button name="button5" label="Bottom toolbar"/>
+      <button name="button6" label="Bottom toolbar"/>
+    </toolbar>
+  </layout_panel>
+  </layout_stack>
 </toolbar_view>
diff --git a/indra/newview/skins/default/xui/en/widgets/toolbar.xml b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
index 45210277b2..69fd6f569c 100644
--- a/indra/newview/skins/default/xui/en/widgets/toolbar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
@@ -4,7 +4,8 @@
          pad_right="5"
          pad_top="5"
          pad_bottom="5"
-         pad_between="5">
+         pad_between="5"
+         mouse_opaque="false">
 
   <button_panel name="button_panel"
                 bg_opaque_image="Rounded_Rect"
-- 
cgit v1.2.3


From 53a486649381af53d21de28aced388bc2aacac0f Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Mon, 26 Sep 2011 17:38:10 -0700
Subject: EXP-1205 PROGRESS -- As a User, I want a toybox which will contain
 all buttons that I can d&d into the toolbars

* Command buttons are now enabled/disabled in toybox based on whether or not the
  LLToolBarView has them anywhere.
* Commands now have argument to specify whether or not they should be in the
  toybox.
* LLCommandId is now used a universal reference for commands.

Reviewed by Richard.
---
 .../newview/skins/default/xui/en/floater_toybox.xml | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_toybox.xml b/indra/newview/skins/default/xui/en/floater_toybox.xml
index 1c9f20c496..60a39b0bff 100644
--- a/indra/newview/skins/default/xui/en/floater_toybox.xml
+++ b/indra/newview/skins/default/xui/en/floater_toybox.xml
@@ -14,17 +14,17 @@
   save_rect="true"
   single_instance="true"
   title="Customize toolbars"
-  width="658">
+  width="650">
   <text
     follows="left|top"
     font="SansSerifMedium"
     halign="left"
     height="20"
     layout="topleft"
-    left="40"
+    left="20"
     length="1"
     name="toybox label 1"
-    right="-40"
+    right="-20"
     top="35"
     type="string">
       Add or remove buttons by dragging them to or from the toolbars.
@@ -35,10 +35,10 @@
     halign="left"
     height="20"
     layout="topleft"
-    left="40"
+    left="20"
     length="1"
     name="toybox label 2"
-    right="-40"
+    right="-20"
     top="55"
     type="string">
       Buttons will appear as shown or as icon-only depending on each toolbar's settings.
@@ -46,12 +46,17 @@
   <toolbar
     bottom="395"
     button_display_mode="icons_with_text"
-    left="40"
+    left="20"
     max_button_width="140"
     min_button_width="70"
     name="toybox_toolbar"
+    pad_left="5"
+    pad_right="5"
+    pad_top="5"
+    pad_bottom="5"
+    pad_between="15"
     read_only="true"
-    right="-40"
+    right="-20"
     side="top"
     top="85">
   </toolbar>
@@ -61,7 +66,7 @@
     label="Restore defaults"
     label_selected="Restore defaults"
     layout="topleft"
-    left="40"
+    left="20"
     name="btn_restore_defaults"
     top="415"
     width="130">
-- 
cgit v1.2.3


From 7fd0e8c69e6dced4a770da4fac10c154eac5899f Mon Sep 17 00:00:00 2001
From: Richard Nelson <richard@lindenlab.com>
Date: Mon, 26 Sep 2011 18:51:43 -0700
Subject: fixed toolbar context menu deprecated pointless
 LLView::deleteViewByHandle

---
 indra/newview/skins/default/xui/en/menu_toolbars.xml   | 4 ++--
 indra/newview/skins/default/xui/en/widgets/toolbar.xml | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/menu_toolbars.xml b/indra/newview/skins/default/xui/en/menu_toolbars.xml
index b3ecd3dcb6..de13fec670 100644
--- a/indra/newview/skins/default/xui/en/menu_toolbars.xml
+++ b/indra/newview/skins/default/xui/en/menu_toolbars.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<menu bottom="825"
+<context_menu
       layout="topleft"
       name="Toolbars Popup"
       visible="false">
@@ -26,4 +26,4 @@
     <on_check function="Toolbars.CheckSetting"
               parameter="icons_only" />
   </menu_item_check>
-</menu>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/en/widgets/toolbar.xml b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
index 95ccc6e92c..29b5d02299 100644
--- a/indra/newview/skins/default/xui/en/widgets/toolbar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
@@ -7,7 +7,6 @@
          pad_between="5"
          mouse_opaque="false"
          read_only="false">
-
   <button_panel name="button_panel"
                 bg_opaque_image="Rounded_Rect"
                 background_visible="true"
-- 
cgit v1.2.3


From f56bf69dfed63d8b7d5d8994c0c3cafced803a0f Mon Sep 17 00:00:00 2001
From: Richard Nelson <richard@lindenlab.com>
Date: Mon, 26 Sep 2011 19:48:17 -0700
Subject: initial support for switching between icons only and icons + text

---
 .../skins/default/xui/en/floater_test_toolbar.xml  | 38 +++++++---------------
 .../skins/default/xui/en/panel_toolbar_view.xml    | 25 +++++---------
 .../skins/default/xui/en/widgets/toolbar.xml       |  2 ++
 3 files changed, 23 insertions(+), 42 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_test_toolbar.xml b/indra/newview/skins/default/xui/en/floater_test_toolbar.xml
index b58c006b3f..fbfbe51a69 100644
--- a/indra/newview/skins/default/xui/en/floater_test_toolbar.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_toolbar.xml
@@ -16,14 +16,9 @@
            min_button_width="0"
            max_button_width="100"
            side="top">
-    <button auto_resize="true"
-            use_ellipses="true"
-            label="Button"/>
-    <button auto_resize="true"
-            label="Button with long label"/>
-    <button auto_resize="true"
-            use_ellipses="true"
-            label="Button with longest label of all"/>
+    <command name="avatar"/>
+    <command name="build"/>
+    <command name="chat"/>
   </toolbar>
   <toolbar name="test_toolbar_left"
            follows="left|bottom|top"
@@ -33,12 +28,9 @@
            top="70"
            min_button_width="100"           
            side="left">
-    <button height="30"
-            label="Button"/>
-    <button height="50"
-            label="Button with long label"/>
-    <button height="60"
-            label="Button with longest label of all"/>
+    <command name="avatar"/>
+    <command name="build"/>
+    <command name="chat"/>
   </toolbar>
   <toolbar name="test_toolbar_right"
            follows="right|bottom|top"
@@ -47,12 +39,9 @@
            right="500"
            top="70"
            side="right">
-    <button auto_resize="true"
-            label="Button 1"/>
-    <button auto_resize="true"
-            label="Button with long label"/>
-    <button auto_resize="true"
-            label="Button with longest label of all"/>
+    <command name="avatar"/>
+    <command name="build"/>
+    <command name="chat"/>
   </toolbar>
   <toolbar name="test_toolbar_bottom"
            follows="left|right|bottom"
@@ -62,11 +51,8 @@
            bottom="500"
            min_button_width="100"
            side="bottom">
-    <button auto_resize="true"
-            label="Button"/>
-    <button auto_resize="true"
-            label="Button with long label"/>
-    <button auto_resize="true"
-            label="Button with longest label of all"/>
+    <command name="avatar"/>
+    <command name="build"/>
+    <command name="chat"/>
   </toolbar>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
index b24f5c3347..23ea516b86 100644
--- a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
+++ b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
@@ -47,11 +47,9 @@
                  top="0"
                  side="left"
                  button_display_mode="icons_only">
-          <button name="button1" label="Left Toolbar"/>
-          <button name="button2" label="Left Toolbar"/>
-          <button name="button3" label="Left Toolbar"/>
-          <button name="button4" label="Left Toolbar"/>
-          <button name="button5" label="Left Toolbar"/>
+          <command name="avatar"/>
+          <command name="build"/>
+          <command name="chat"/>
         </toolbar>
       </layout_panel>
       <layout_panel name="non_toolbar_panel"
@@ -74,11 +72,9 @@
           top="0"
           side="right"
           button_display_mode="icons_only">
-          <button name="button1" label="Right Toolbar"/>
-          <button name="button2" label="Right Toolbar"/>
-          <button name="button3" label="Right Toolbar"/>
-          <button name="button4" label="Right Toolbar"/>
-          <button name="button5" label="Right Toolbar"/>
+          <command name="avatar"/>
+          <command name="build"/>
+          <command name="chat"/>
         </toolbar>
       </layout_panel>
     </layout_stack>
@@ -100,12 +96,9 @@
              follows="left|right|bottom"
              button_display_mode="icons_with_text"
              visible="true">
-      <button name="button1" label="Bottom toolbar"/>
-      <button name="button2" label="Bottom toolbar"/>
-      <button name="button3" label="Bottom toolbar"/>
-      <button name="button4" label="Bottom toolbar"/>
-      <button name="button5" label="Bottom toolbar"/>
-      <button name="button6" label="Bottom toolbar"/>
+      <command name="avatar"/>
+      <command name="build"/>
+      <command name="chat"/>
     </toolbar>
   </layout_panel>
   </layout_stack>
diff --git a/indra/newview/skins/default/xui/en/widgets/toolbar.xml b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
index 29b5d02299..32bc88cc9a 100644
--- a/indra/newview/skins/default/xui/en/widgets/toolbar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
@@ -13,9 +13,11 @@
                 background_opaque="true"/>
   <button_icon_and_text follows="left|top"
                         chrome="true"
+                        image_overlay_alignment="left"
                         use_ellipses="true"
                         auto_resize="true"/>
   <button_icon follows="left|top"
+               label=""
                chrome="true"
                use_ellipses="true"
                auto_resize="true"/>
-- 
cgit v1.2.3


From 795ae760e8b81a4e1b0ae4666d94d80919305189 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Tue, 27 Sep 2011 10:12:48 -0700
Subject: adding missing xml file

---
 .../skins/default/xui/en/floater_chat_bar.xml      | 63 ++++++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/floater_chat_bar.xml

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_chat_bar.xml b/indra/newview/skins/default/xui/en/floater_chat_bar.xml
new file mode 100644
index 0000000000..d0059b281e
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_chat_bar.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ height="60"
+ layout="topleft"
+ legacy_header_height="20"
+ title="Nearby chat"
+ can_close="true"
+ can_minimize="true"
+ help_topic="chat_bar"
+ save_rect="true"
+ min_height="60"
+ min_width="150"
+ can_resize="true"
+ name="chat_bar"
+ width="380">
+    <line_editor
+     border_style="line"
+     border_thickness="1"
+     follows="left|right"
+     height="23"
+     label="Click here to chat."
+     layout="topleft"
+     left_delta="7"
+     left="0"
+     max_length_bytes="1023"
+     name="chat_box"
+     text_pad_left="5"
+     text_pad_right="25"
+     tool_tip="Press Enter to say, Ctrl+Enter to shout"
+     top="27"
+     width="335" />
+    <output_monitor
+     auto_update="true"
+     follows="right"
+     draw_border="false"
+     height="16"
+     layout="topleft"
+     left_pad="-24"
+     mouse_opaque="true"
+     name="chat_zone_indicator"
+     top="31"
+     visible="true"
+     width="20" />
+    <button
+     follows="right"
+     is_toggle="true"
+     width="20"
+     top="27"
+     layout="topleft"
+     left_pad="12"
+     image_disabled="ComboButton_UpOff"
+     image_unselected="ComboButton_UpOff"
+     image_selected="ComboButton_On"
+     image_pressed="ComboButton_UpSelected"
+     image_pressed_selected="ComboButton_Selected"
+     height="23"
+     name="show_nearby_chat"
+     tool_tip="Shows/hides nearby chat log">
+        <button.init_callback
+           function="Button.SetDockableFloaterToggle"
+           parameter="nearby_chat" />
+    </button>
+</floater>
-- 
cgit v1.2.3


From 0f3221e25d6261d7f29b5b37391156c07fde1d0c Mon Sep 17 00:00:00 2001
From: Seth ProductEngine <slitovchuk@productengine.com>
Date: Tue, 27 Sep 2011 21:05:05 +0300
Subject: EXP-1225 FIXED Added a floater for My Inventory side tab. - Replaced
 calls to LLSideTray with LLFloaterSidePanelContainer. - Added
 LLFloaterSidePanelContainer::getPanel<T>() for getting custom type panels.

---
 .../skins/default/xui/en/floater_my_inventory.xml    | 20 ++++++++++++++++++++
 indra/newview/skins/default/xui/en/menu_viewer.xml   |  4 ++--
 2 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/floater_my_inventory.xml

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_my_inventory.xml b/indra/newview/skins/default/xui/en/floater_my_inventory.xml
new file mode 100644
index 0000000000..fd03a5324e
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_my_inventory.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<floater
+ can_close="true"
+ can_resize="true"
+ height="570"
+ help_topic="sidebar_inventory"
+ min_width="333"
+ min_height="440"
+ name="floater_my_inventory"
+ save_rect="true"
+ save_visibility="true"
+ title="My Inventory"
+ width="333" >
+   <panel
+    class="sidepanel_inventory"
+    name="main_panel"
+    filename="sidepanel_inventory.xml"
+    follows="all"
+    top="0"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 36ebe73753..2e9a66de5b 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -67,10 +67,10 @@
 		 visible="true">
             <menu_item_check.on_check
              function="SidetrayPanelVisible"
-             parameter="sidepanel_inventory" />
+             parameter="my_inventory" />
             <menu_item_check.on_click
              function="ShowSidetrayPanel"
-             parameter="sidepanel_inventory" />
+             parameter="my_inventory" />
         </menu_item_check>
         <menu_item_check
          label="My Gestures"
-- 
cgit v1.2.3


From 3c8b0ab537049141b5ce6201fdf611ff09784df4 Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Tue, 27 Sep 2011 22:06:56 +0300
Subject: EXP-1226 FIXED (Create and register a floater for Appearance side
 tab)

- Added xml for a new floater Appearance and registred it in the floaterreg

- Removed side tray dependencies

- Added static helper method: LLFloaterSidePanelContainer::getPanel
---
 .../skins/default/xui/en/floater_my_appearance.xml   | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/floater_my_appearance.xml

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_my_appearance.xml b/indra/newview/skins/default/xui/en/floater_my_appearance.xml
new file mode 100644
index 0000000000..8f97887b3f
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_my_appearance.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<floater
+  legacy_header_height="18"
+  can_resize="true"
+  height="588"
+  layout="topleft"
+  name="floater_my_appearance"
+  save_rect="true"
+  single_instance="true"
+  title="MY APPEARANCE"
+  width="333">
+    <panel
+      top="18"
+      class="sidepanel_appearance"
+      name="main_panel"
+      filename="sidepanel_appearance.xml"
+      label="Edit Appearance"
+      font="SansSerifBold"/>
+</floater>
-- 
cgit v1.2.3


From b6feeea2b550b981dbb04558902020e8cae16f7b Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Tue, 27 Sep 2011 12:40:06 -0700
Subject: * Updated toybox to center bottom button and add delimeter

---
 indra/newview/skins/default/xui/en/floater_toybox.xml | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_toybox.xml b/indra/newview/skins/default/xui/en/floater_toybox.xml
index 60a39b0bff..092eddaa53 100644
--- a/indra/newview/skins/default/xui/en/floater_toybox.xml
+++ b/indra/newview/skins/default/xui/en/floater_toybox.xml
@@ -46,6 +46,7 @@
   <toolbar
     bottom="395"
     button_display_mode="icons_with_text"
+    follows="all"
     left="20"
     max_button_width="140"
     min_button_width="70"
@@ -58,15 +59,22 @@
     read_only="true"
     right="-20"
     side="top"
-    top="85">
-  </toolbar>
+    top="85" />
+  <panel
+    bevel_style="none"
+    border="true"
+    bottom="396"
+    follows="left|bottom|right"
+    left="20"
+    right="-20"
+    top="396" />
   <button
-    follows="left|bottom"
+    follows="left|bottom|right"
     height="23"
     label="Restore defaults"
     label_selected="Restore defaults"
     layout="topleft"
-    left="20"
+    left="260"
     name="btn_restore_defaults"
     top="415"
     width="130">
-- 
cgit v1.2.3


From 8fd2d69fdf47e0f586c6010c589411e251967038 Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Tue, 27 Sep 2011 22:51:43 +0300
Subject: EXP-1224 FIXED (Create and register a floater for People side tab)

- Added a floater for People side tab.
- Replaced calls to LLSideTray with LLFloaterSidePanelContainer.
---
 .../skins/default/xui/en/floater_people.xml        | 45 ++++++++++++++++++++++
 .../xui/en/menu_people_friends_view_sort.xml       |  2 +-
 .../xui/en/menu_people_nearby_view_sort.xml        |  2 +-
 .../xui/en/menu_people_recent_view_sort.xml        |  2 +-
 4 files changed, 48 insertions(+), 3 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/floater_people.xml

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_people.xml b/indra/newview/skins/default/xui/en/floater_people.xml
new file mode 100644
index 0000000000..6ccf81c846
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_people.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+
+<floater
+  legacy_header_height="18"
+  can_close="true"
+  can_resize="true"
+  height="588"
+  min_width="333"
+  min_height="440"
+  layout="topleft"
+  name="floater_people"
+  save_rect="true"
+  single_instance="true"
+  title="PEOPLE"
+  width="333">
+    <panel_container
+      default_panel_name="panel_people"
+      follows="all"
+      layout="topleft"
+      name="main_panel"
+      top="18"
+      width="333"
+      height="570">
+      <panel
+        class="panel_people"
+        name="panel_people"
+        filename="panel_people.xml"/>
+      <panel
+        class="panel_profile_view"
+        name="panel_profile_view"
+        filename="panel_profile_view.xml"/>
+      <panel
+        class="panel_group_info_sidetray"
+        name="panel_group_info_sidetray"
+        filename="panel_group_info_sidetray.xml"
+        label="Group Profile"
+        font="SansSerifBold"/>
+      <panel
+        class="panel_block_list_sidetray"
+        name="panel_block_list_sidetray"
+        filename="panel_block_list_sidetray.xml"
+        label="Blocked Residents &amp; Objects"
+        font="SansSerifBold"/>
+    </panel_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml
index 29eeb93ac1..b452f96e7a 100644
--- a/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml
@@ -42,6 +42,6 @@
   </menu_item_check>
   <menu_item_separator layout="topleft" />
   <menu_item_call name="show_blocked_list" label="Show Blocked Residents &amp; Objects">
-    <menu_item_call.on_click function="SideTray.ShowPanel" parameter="panel_block_list_sidetray" />
+    <menu_item_call.on_click function="People.Friends.ViewSort.Action" parameter="panel_block_list_sidetray" />
   </menu_item_call>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml
index 65bd2793b6..614dd693c5 100644
--- a/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml
@@ -52,6 +52,6 @@
   </menu_item_check>
   <menu_item_separator layout="topleft" />
   <menu_item_call name="show_blocked_list" label="Show Blocked Residents &amp; Objects">
-    <menu_item_call.on_click function="SideTray.ShowPanel" userdata="panel_block_list_sidetray" />
+    <menu_item_call.on_click function="People.Nearby.ViewSort.Action" userdata="panel_block_list_sidetray" />
   </menu_item_call>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml
index 0634e3bd3b..485a5a658c 100644
--- a/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml
@@ -34,6 +34,6 @@
   </menu_item_check>
   <menu_item_separator layout="topleft" />
   <menu_item_call name="show_blocked_list" label="Show Blocked Residents &amp; Objects">
-    <menu_item_call.on_click function="SideTray.ShowPanel" userdata="panel_block_list_sidetray" />
+    <menu_item_call.on_click function="People.Recent.ViewSort.Action" userdata="panel_block_list_sidetray" />
   </menu_item_call>
 </toggleable_menu>
-- 
cgit v1.2.3


From 0e4f226b56cb2dea1e8d5e9f1267a16c302bb5a9 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Tue, 27 Sep 2011 14:58:20 -0700
Subject: EXP-1211 : Read toolbar default settings from toolbars.xml, no saving
 of settings done yet.

---
 indra/newview/skins/default/xui/en/panel_toolbar_view.xml | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
index 23ea516b86..fa7632920b 100644
--- a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
+++ b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
@@ -47,9 +47,6 @@
                  top="0"
                  side="left"
                  button_display_mode="icons_only">
-          <command name="avatar"/>
-          <command name="build"/>
-          <command name="chat"/>
         </toolbar>
       </layout_panel>
       <layout_panel name="non_toolbar_panel"
@@ -72,9 +69,6 @@
           top="0"
           side="right"
           button_display_mode="icons_only">
-          <command name="avatar"/>
-          <command name="build"/>
-          <command name="chat"/>
         </toolbar>
       </layout_panel>
     </layout_stack>
@@ -96,9 +90,6 @@
              follows="left|right|bottom"
              button_display_mode="icons_with_text"
              visible="true">
-      <command name="avatar"/>
-      <command name="build"/>
-      <command name="chat"/>
     </toolbar>
   </layout_panel>
   </layout_stack>
-- 
cgit v1.2.3


From 0207d7e9e4e5b509b5905256a56ac2138b35cac3 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Tue, 27 Sep 2011 15:41:06 -0700
Subject: EXP-1247 Nearby chat as part of chat floater

---
 .../skins/default/xui/en/floater_chat_bar.xml      | 23 +++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

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 d0059b281e..9d61c94eb1 100644
--- a/indra/newview/skins/default/xui/en/floater_chat_bar.xml
+++ b/indra/newview/skins/default/xui/en/floater_chat_bar.xml
@@ -3,16 +3,27 @@
  height="60"
  layout="topleft"
  legacy_header_height="20"
+ single_instance="true"
  title="Nearby chat"
+ save_rect="true"
  can_close="true"
  can_minimize="true"
  help_topic="chat_bar"
- save_rect="true"
  min_height="60"
  min_width="150"
  can_resize="true"
  name="chat_bar"
  width="380">
+    <panel
+        top="20"
+        class="panel_nearby_chat"
+        follow="all"
+        width="380"
+        height="0"
+        visible="false"
+        filename="panel_nearby_chat.xml"
+        name="nearby_chat" />
+    <panel width="380" height="31" left="0" bottom="-1" follows="left|right|bottom">
     <line_editor
      border_style="line"
      border_thickness="1"
@@ -27,7 +38,7 @@
      text_pad_left="5"
      text_pad_right="25"
      tool_tip="Press Enter to say, Ctrl+Enter to shout"
-     top="27"
+     top="0"
      width="335" />
     <output_monitor
      auto_update="true"
@@ -38,14 +49,14 @@
      left_pad="-24"
      mouse_opaque="true"
      name="chat_zone_indicator"
-     top="31"
+     top="4"
      visible="true"
      width="20" />
     <button
      follows="right"
      is_toggle="true"
      width="20"
-     top="27"
+     top="0"
      layout="topleft"
      left_pad="12"
      image_disabled="ComboButton_UpOff"
@@ -56,8 +67,6 @@
      height="23"
      name="show_nearby_chat"
      tool_tip="Shows/hides nearby chat log">
-        <button.init_callback
-           function="Button.SetDockableFloaterToggle"
-           parameter="nearby_chat" />
     </button>
+    </panel>
 </floater>
-- 
cgit v1.2.3


From c7f5aebbb71228b705059be248e82e83ee0f9475 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Tue, 27 Sep 2011 15:41:41 -0700
Subject: Nearby chat panel

---
 .../skins/default/xui/en/panel_nearby_chat.xml     | 35 ++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/panel_nearby_chat.xml

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_nearby_chat.xml b/indra/newview/skins/default/xui/en/panel_nearby_chat.xml
new file mode 100644
index 0000000000..f766236b2e
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_nearby_chat.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel
+ height="300"
+ follows="all"
+ layout="topleft"
+ name="nearby_chat"
+ help_topic="nearby_chat"
+ width="320">
+            <check_box
+             bottom_delta="36"
+             control_name="TranslateChat"
+             enabled="true"
+             height="16"
+             label="Translate chat (powered by Google)"
+             layout="topleft"
+             left="5"
+             name="translate_chat_checkbox"
+             width="230" />
+  <chat_history
+    parse_urls="true"
+    bg_readonly_color="ChatHistoryBgColor"
+    bg_writeable_color="ChatHistoryBgColor"
+    follows="all"
+    left="5"
+    top_delta="17"
+    layout="topleft"
+    height="260"
+    name="chat_history"
+    parse_highlights="true"
+    text_color="ChatHistoryTextColor"
+    text_readonly_color="ChatHistoryTextColor"
+    right_widget_pad="5"
+    left_widget_pad="0"
+    width="315" />
+</panel>
-- 
cgit v1.2.3


From bce16356c9e1fb76bd92a3530375e4c6c7a5430a Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 27 Sep 2011 17:47:52 -0700
Subject: fixed wobble when toggling inbox/outbox

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

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index 7a176ff367..2b5e3143a4 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -67,6 +67,8 @@
 										top="0"
 										orientation="vertical"
 										name="inbox_outbox_layout_stack"
+                    open_time_constant="0.02"
+                    close_time_constant="0.02"
 										height="235"
 										width="330">
 								 <layout_panel
-- 
cgit v1.2.3


From 68d5141fb3ccb5e898caa83e9eab84d76134e28c Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 27 Sep 2011 19:06:02 -0700
Subject: EXP-1258 WIP toggle buttons between icons and icons+text modes fixed
 button layout for icon+text layout stack now uses floating point precision to
 avoid clamping panels to 0

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

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_test_toolbar.xml b/indra/newview/skins/default/xui/en/floater_test_toolbar.xml
index fbfbe51a69..067c1fed82 100644
--- a/indra/newview/skins/default/xui/en/floater_test_toolbar.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_toolbar.xml
@@ -8,6 +8,7 @@
  translate="false"
  width="500">
   <toolbar name="test_toolbar_top"
+           button_display_mode="icons_with_text"
            follows="left|right|top"
            height="50"
            width="500"
@@ -21,6 +22,7 @@
     <command name="chat"/>
   </toolbar>
   <toolbar name="test_toolbar_left"
+           button_display_mode="icons_with_text"
            follows="left|bottom|top"
            height="380"
            width="200"
@@ -33,6 +35,7 @@
     <command name="chat"/>
   </toolbar>
   <toolbar name="test_toolbar_right"
+           button_display_mode="icons_with_text"
            follows="right|bottom|top"
            height="380"
            width="200"
@@ -44,6 +47,7 @@
     <command name="chat"/>
   </toolbar>
   <toolbar name="test_toolbar_bottom"
+           button_display_mode="icons_with_text"
            follows="left|right|bottom"
            height="50"
            width="500"
-- 
cgit v1.2.3


From d447f1908bc2da9067d1f4d34825618a4d176602 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Wed, 28 Sep 2011 15:27:34 -0700
Subject: EXP-1262 Hitting single letters reserved for shortcuts inworld opens
 chat but not associated shortcuts (like Mouselook and Fly) EXP-1266
 Communicate > Nearby Chat menu item does not bring up chat floater

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

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 2e93243b0f..923430d6fd 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -227,10 +227,10 @@
          use_mac_ctrl="true">
             <menu_item_check.on_check
              function="Floater.Visible"
-             parameter="nearby_chat" />
+             parameter="chat_bar" />
             <menu_item_check.on_click
              function="Floater.Toggle"
-             parameter="nearby_chat" />
+             parameter="chat_bar" />
         </menu_item_check>
         <menu_item_call
          label="Nearby People"
-- 
cgit v1.2.3


From b7c19906a0d30f545f12412e2344b5e66e8375f6 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Wed, 28 Sep 2011 15:27:53 -0700
Subject: removing old xml nearby chat

---
 .../skins/default/xui/en/floater_nearby_chat.xml   | 50 ----------------------
 1 file changed, 50 deletions(-)
 delete mode 100644 indra/newview/skins/default/xui/en/floater_nearby_chat.xml

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
deleted file mode 100644
index ab966dbb0e..0000000000
--- a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater
- border_visible="false"
- border="false"
- legacy_header_height="18"
- can_minimize="true"
- can_tear_off="false"
- can_resize="true"
- can_drag_on_left="false"
- can_close="false"
- can_dock="true"
- bevel_style="in"
- height="300"
- min_width="235"
- layout="topleft"
- name="nearby_chat"
- help_topic="nearby_chat"
- save_rect="true"
- title="NEARBY CHAT"
- save_dock_state="true"
- save_visibility="true"
- single_instance="true"
- width="320">
-            <check_box
-             bottom_delta="36"
-             control_name="TranslateChat"
-             enabled="true"
-             height="16"
-             label="Translate chat (powered by Google)"
-             layout="topleft"
-             left="5"
-             name="translate_chat_checkbox"
-             width="230" />
-  <chat_history
-    parse_urls="true"
-    bg_readonly_color="ChatHistoryBgColor"
-    bg_writeable_color="ChatHistoryBgColor"
-    follows="all"
-    left="5"
-    top_delta="17"
-    layout="topleft"
-    height="260"
-    name="chat_history"
-    parse_highlights="true"
-    text_color="ChatHistoryTextColor"
-    text_readonly_color="ChatHistoryTextColor"
-    right_widget_pad="5"
-    left_widget_pad="0"
-    width="315" />
-</floater>
-- 
cgit v1.2.3


From fdf042bdb9aeefa209694e04d4012a3a1f911a52 Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Wed, 28 Sep 2011 16:54:34 -0700
Subject: EXP-1205 PROGRESS -- As a User, I want a toybox which will contain
 all buttons that I can d&d into the toolbars EXP-1233 FIX -- Populate the
 toybox floater window with all FUI toolbar buttons indicated as such in the
 "commands.xml" definition. EXP-1267 FIX -- Enable/disable buttons in the
 toybox

* Hooked up button callbacks to the toolbar buttons
* Fixed toybox button enable/disable to function properly and live update as
  buttons change states.
* Removed the toybox toolbar background image

Reviewed by Leyla
---
 indra/newview/skins/default/xui/en/floater_toybox.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_toybox.xml b/indra/newview/skins/default/xui/en/floater_toybox.xml
index 092eddaa53..feb19571b2 100644
--- a/indra/newview/skins/default/xui/en/floater_toybox.xml
+++ b/indra/newview/skins/default/xui/en/floater_toybox.xml
@@ -59,7 +59,9 @@
     read_only="true"
     right="-20"
     side="top"
-    top="85" />
+    top="85">
+    <button_panel background_visible="false" />
+  </toolbar>
   <panel
     bevel_style="none"
     border="true"
-- 
cgit v1.2.3


From 9d3fc5d930bd1dae07771350080e5140c0113891 Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Thu, 29 Sep 2011 21:43:07 +0300
Subject: EXP-1209 FIXED Sidetray removed.

- Removed all sidetray dependencies and the sidetray itself.

- Also removed LLFloaterSidetrayTab and LLSidetrayListener as unused.
---
 indra/newview/skins/default/xui/en/main_view.xml      | 19 -------------------
 indra/newview/skins/default/xui/en/menu_login.xml     |  8 --------
 .../skins/default/xui/en/panel_preferences_move.xml   | 10 ----------
 3 files changed, 37 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml
index 6ece01b2ba..d8f593715f 100644
--- a/indra/newview/skins/default/xui/en/main_view.xml
+++ b/indra/newview/skins/default/xui/en/main_view.xml
@@ -90,14 +90,6 @@
                      top="0"
                      visible="false"
                      width="1024"/>
-              <panel follows="right|top|bottom"
-                     height="500"
-                     mouse_opaque="false"
-                     name="side_bar_tabs"
-                     right="500"
-                     tab_stop="false"
-                     top="0"
-                     width="32"/>
               <panel bottom="500"
                      follows="left|right|bottom"
                      height="25"
@@ -116,17 +108,6 @@
                    visible="false"/>
           </layout_stack>
         </layout_panel>
-        <!-- side tray -->
-        <layout_panel auto_resize="false"
-                      follows="top|bottom"
-                      height="500"
-                      min_width="333"
-                      mouse_opaque="false"
-                      tab_stop="false"
-                      name="side_tray_container"
-                      user_resize="false"
-                      visible="false"
-                      width="333"/>
       </layout_stack>
       <panel top="0"
          follows="all"
diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml
index bb58dd500f..80e310a873 100644
--- a/indra/newview/skins/default/xui/en/menu_login.xml
+++ b/indra/newview/skins/default/xui/en/menu_login.xml
@@ -93,14 +93,6 @@
              parameter="ui_preview" />
         </menu_item_call>
       <menu_item_separator />
-      <!-- Broken
-      <menu_item_call
-         label="Show Side Tray"
-         name="Show Side Tray">
-        <menu_item_call.on_click
-         function="Advanced.ShowSideTray" />
-      </menu_item_call>
-      -->
       <menu
        create_jump_keys="true"
        label="UI Tests"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_move.xml b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
index 1a8aae7f91..c131649fc8 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
@@ -86,16 +86,6 @@
    name="appearance_camera_movement"
    tool_tip="Use automatic camera positioning while in edit mode"
    width="242" />
-  <check_box
-   control_name="SidebarCameraMovement"
-   follows="left|top"
-   height="16"
-   initial_value="true"
-   label="Sidebar"
-   layout="topleft"
-   name="appearance_sidebar_positioning"
-   tool_tip="Use automatic camera positioning for sidebar"
-   width="242" />
   <icon
 	 follows="left|top"
 	 height="18"
-- 
cgit v1.2.3


From b07e7c7198fbc78ca852b3ba48d516ec2901da21 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Thu, 29 Sep 2011 15:01:15 -0700
Subject: EXP-1211, EXP-1257 : Save and load the button type along with the
 toolbars, add a force default load option, enforce consistency between menus
 and toolbars

---
 indra/newview/skins/default/xui/en/menu_toolbars.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/menu_toolbars.xml b/indra/newview/skins/default/xui/en/menu_toolbars.xml
index de13fec670..59912b5503 100644
--- a/indra/newview/skins/default/xui/en/menu_toolbars.xml
+++ b/indra/newview/skins/default/xui/en/menu_toolbars.xml
@@ -12,11 +12,11 @@
   <menu_item_separator layout="topleft" />
   <menu_item_check label="Icons and labels"
                    layout="topleft"
-                   name="icons_and_labels">
+                   name="icons_with_text">
     <on_click function="Toolbars.EnableSetting"
-              parameter="icons_and_labels" />
+              parameter="icons_with_text" />
     <on_check function="Toolbars.CheckSetting"
-              parameter="icons_and_labels" />
+              parameter="icons_with_text" />
   </menu_item_check>
   <menu_item_check label="Icons only"
                    layout="topleft"
-- 
cgit v1.2.3


From 66e21e0330b2f66b986a1ed76873af9752dcf2e1 Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Thu, 29 Sep 2011 17:03:36 -0700
Subject:  * Added latest set of FUI buttons and labels according to the wiki 
 * Hooked up commands to their respective floaters

---
 indra/newview/skins/default/xui/en/strings.xml | 78 ++++++++++++++------------
 1 file changed, 42 insertions(+), 36 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index feea555fdc..158e1c711d 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -16,16 +16,16 @@
 	<string name="StartupDetectingHardware">Detecting hardware...</string>
 	<string name="StartupLoading">Loading [APP_NAME]...</string>
 	<string name="StartupClearingCache">Clearing cache...</string>
-	<string name="StartupInitializingTextureCache">Initializing Texture Cache...</string>
+	<string name="StartupInitializingTextureCache">Initializing texture cache...</string>
 	<string name="StartupInitializingVFS">Initializing VFS...</string>
-  <string name="StartupRequireDriverUpdate">Graphics Initialization Failed. Please Update Your Graphics Driver!</string>
+  <string name="StartupRequireDriverUpdate">Graphics initialization failed. Please update your graphics driver!</string>
 
 	<!--  progress -->
 	<string name="ProgressRestoring">Restoring...</string>
-	<string name="ProgressChangingResolution">Changing Resolution...</string>
+	<string name="ProgressChangingResolution">Changing resolution...</string>
 
 	<!-- Legacy strings, almost never used -->
-	<string name="Fullbright">Fullbright (Legacy)</string>	<!-- used in the Build > materials dropdown-->
+	<string name="Fullbright">Fullbright (legacy)</string>	<!-- used in the Build > materials dropdown-->
 
 	<!-- Login -->
 	<string name="LoginInProgress">Logging in. [APP_NAME] may appear frozen.  Please wait.</string>
@@ -38,8 +38,8 @@
   <string name="LoginInitializingMultimedia">Initializing multimedia...</string>
   <string name="LoginInitializingFonts">Loading fonts...</string>
   <string name="LoginVerifyingCache">Verifying cache files (can take 60-90 seconds)...</string>
-	<string name="LoginProcessingResponse">Processing Response...</string>
-	<string name="LoginInitializingWorld">Initializing World...</string>
+	<string name="LoginProcessingResponse">Processing response...</string>
+	<string name="LoginInitializingWorld">Initializing world...</string>
 	<string name="LoginDecodingImages">Decoding images...</string>
 	<string name="LoginInitializingQuicktime">Initializing QuickTime...</string>
 	<string name="LoginQuicktimeNotFound">QuickTime not found - unable to initialize.</string>
@@ -56,7 +56,7 @@
         <string name="CertBasicConstraints">Too many certificates were in the servers Certificate chain.  Please contact your Grid administrator.</string>
         <string name="CertInvalidSignature">The certificate signature returned by the Grid server could not be verified.  Please contact your Grid administrator.</string>
 
-	<string name="LoginFailedNoNetwork">Network Error: Could not establish connection, please check your network connection.</string>
+	<string name="LoginFailedNoNetwork">Network error: Could not establish connection, please check your network connection.</string>
 	<string name="LoginFailed">Login failed.</string>
 	<string name="Quit">Quit</string>
 	<string name="create_account_url">http://join.secondlife.com/</string>
@@ -3652,47 +3652,53 @@ Try enclosing path to the editor with double quotes.
   <string name="ParticleHiding">Hiding Particles</string>
 
   <!-- commands -->
+
+  <string name="Command_AboutLand_Label">About land</string>
+  <string name="Command_Appearance_Label">Appearance</string>
   <string name="Command_Avatar_Label">Avatar</string>
-  <string name="Command_Avatar_Tooltip">Change the appearance of your avatar</string>
   <string name="Command_Build_Label">Build</string>
-  <string name="Command_Build_Tooltip">Building, reshaping terrain</string>
   <string name="Command_Chat_Label">Chat</string>
-  <string name="Command_Chat_Tooltip">Chat with people nearby</string>
   <string name="Command_Compass_Label">Compass</string>
-  <string name="Command_Compass_Tooltip"></string>
+  <string name="Command_Destinations_Label">Destinations</string>
   <string name="Command_Gestures_Label">Gestures</string>
-  <string name="Command_Gestures_Tooltip"></string>
-  <string name="Command_HowTo_Label">How To</string>
-  <string name="Command_HowTo_Tooltip"></string>
-  <string name="Command_Landmarks_Label">Landmarks</string>
-  <string name="Command_Landmarks_Tooltip"></string>
+  <string name="Command_HowTo_Label">How to</string>
+  <string name="Command_Inventory_Label">Inventory</string>
   <string name="Command_Map_Label">Map</string>
-  <string name="Command_Map_Tooltip"></string>
-  <string name="Command_MiniMap_Label">Mini Map</string>
-  <string name="Command_MiniMap_Tooltip"></string>
+  <string name="Command_Marketplace_Label">Marketplace</string>
+  <string name="Command_MiniMap_Label">Mini-map</string>
   <string name="Command_Move_Label">Move</string>
-  <string name="Command_Move_Tooltip"></string>
-  <string name="Command_MyLand_Label">My Land</string>
-  <string name="Command_MyLand_Tooltip">Information about the land you're visiting</string>
-  <string name="Command_MyStuff_Label">My Stuff</string>
-  <string name="Command_MyStuff_Tooltip">View and use your belongings</string>
   <string name="Command_People_Label">People</string>
-  <string name="Command_People_Tooltip"></string>
   <string name="Command_Places_Label">Places</string>
-  <string name="Command_Places_Tooltip">Destination guide</string>
+  <string name="Command_Preferences_Label">Preferences</string>
+  <string name="Command_Profile_Label">Profile</string>
   <string name="Command_Search_Label">Search</string>
-  <string name="Command_Search_Tooltip">Find...</string>
-  <string name="Command_Settings_Label">Settings</string>
-  <string name="Command_Settings_Tooltip">Preferences</string>
-  <string name="Command_Shop_Label">Shop</string>
-  <string name="Command_Shop_Tooltip"></string>
   <string name="Command_Snapshot_Label">Snapshot</string>
-  <string name="Command_Snapshot_Tooltip">Take a picture</string>
   <string name="Command_Speak_Label">Speak</string>
-  <string name="Command_Speak_Tooltip">Speak with people nearby using your microphone</string>
-  <string name="Command_Upload_Label">Upload</string>
-  <string name="Command_Upload_Tooltip"></string>
   <string name="Command_View_Label">View</string>
-  <string name="Command_View_Tooltip">Changing your view of the world</string>
+  <string name="Command_Voice_Label">Nearby voice</string>
+
+  <string name="Command_AboutLand_Tooltip">Information about the land you're visiting</string>
+  <string name="Command_Appearance_Tooltip">Change your avatar</string>
+  <string name="Command_Avatar_Tooltip">Choose a complete avatar</string>
+  <string name="Command_Build_Tooltip">Building objects and reshaping them</string>
+  <string name="Command_Chat_Tooltip">Chat with people nearby using text</string>
+  <string name="Command_Compass_Tooltip">Compass</string>
+  <string name="Command_Destinations_Tooltip">Destinations of interest</string>
+  <string name="Command_Gestures_Tooltip">Gestures for your avatar</string>
+  <string name="Command_HowTo_Tooltip">How to do common tasks</string>
+  <string name="Command_Inventory_Tooltip">View and use your belongings</string>
+  <string name="Command_Map_Tooltip">Map of the world</string>
+  <string name="Command_Marketplace_Tooltip">Go shopping</string>
+  <string name="Command_MiniMap_Tooltip">Show nearby people</string>
+  <string name="Command_Move_Tooltip">Moving your avatar</string>
+  <string name="Command_People_Tooltip">Friends, groups, and nearby people</string>
+  <string name="Command_Places_Tooltip">Places you've saved</string>
+  <string name="Command_Preferences_Tooltip">Preferences</string>
+  <string name="Command_Profile_Tooltip">Edit or view your profile</string>
+  <string name="Command_Search_Tooltip">Find places, events, people</string>
+  <string name="Command_Snapshot_Tooltip">Take a picture</string>
+  <string name="Command_Speak_Tooltip">Speak with people nearby using your microphone</string>
+  <string name="Command_View_Tooltip">Changing camera angle</string>
+  <string name="Command_Voice_Tooltip">People nearby with voice capability</string>
 
 </strings>
-- 
cgit v1.2.3


From 09e179b2381a4db03309839babae664feb9b0886 Mon Sep 17 00:00:00 2001
From: Richard Nelson <richard@lindenlab.com>
Date: Fri, 30 Sep 2011 16:57:08 -0700
Subject: param block cleanup added Flag as value type moved Batch to
 BatchBlock renamed Choice to ChoiceBlock made merging of parameters for
 ValueParams consistent (fillFrom and overwriteFrom are inverses of each other
 now) made iteration over Multiple<T> type params easier initial schema param
 blocks

---
 indra/newview/skins/default/xui/en/panel_toolbar_view.xml | 3 ---
 indra/newview/skins/default/xui/en/widgets/toolbar.xml    | 1 +
 2 files changed, 1 insertion(+), 3 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
index fa7632920b..7bbacc0152 100644
--- a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
+++ b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
@@ -33,7 +33,6 @@
                   follows="all"
                   mouse_opaque="false">
       <layout_panel name="left_toolbar_panel"
-                    fit_content="true"
                     auto_resize="false"
                     user_resize="false"
                     height="500"
@@ -54,7 +53,6 @@
                     user_resize="false"
                     mouse_opaque="false"/>
       <layout_panel name="right_toolbar_panel"
-                    fit_content="true"
                     auto_resize="false"
                     user_resize="false"
                     height="500"
@@ -74,7 +72,6 @@
     </layout_stack>
   </layout_panel>
   <layout_panel name="bottom_toolbar_panel"
-                fit_content="true"
                 auto_resize="false"
                 user_resize="false"
                 height="30"
diff --git a/indra/newview/skins/default/xui/en/widgets/toolbar.xml b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
index 32bc88cc9a..d16d70cb43 100644
--- a/indra/newview/skins/default/xui/en/widgets/toolbar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
@@ -10,6 +10,7 @@
   <button_panel name="button_panel"
                 bg_opaque_image="Rounded_Rect"
                 background_visible="true"
+                bg_opaque_color="MouseGray"
                 background_opaque="true"/>
   <button_icon_and_text follows="left|top"
                         chrome="true"
-- 
cgit v1.2.3


From 63a8fce12b1e1c0d40d97e2f029776fed6e300fb Mon Sep 17 00:00:00 2001
From: Richard Nelson <richard@lindenlab.com>
Date: Fri, 30 Sep 2011 18:51:17 -0700
Subject: made toolbars conform to visual specs added ability to specify clip
 rects in textures.xml

---
 indra/newview/skins/default/xui/en/main_view.xml   |  4 ++--
 .../skins/default/xui/en/panel_toolbar_view.xml    |  3 +++
 .../skins/default/xui/en/widgets/toolbar.xml       | 28 +++++++++++++++-------
 3 files changed, 24 insertions(+), 11 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml
index d8f593715f..cf566d7d23 100644
--- a/indra/newview/skins/default/xui/en/main_view.xml
+++ b/indra/newview/skins/default/xui/en/main_view.xml
@@ -100,12 +100,12 @@
                      visible="false"
                      width="500"/>
             </layout_panel>
-            <layout_panel auto_resize="false"
+            <!--<layout_panel auto_resize="false"
                    min_height="33"
                    height="33" 
                    mouse_opaque="false"
                    name="bottom_tray_container"
-                   visible="false"/>
+                   visible="false"/>-->
           </layout_stack>
         </layout_panel>
       </layout_stack>
diff --git a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
index 7bbacc0152..44da813f61 100644
--- a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
+++ b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
@@ -39,6 +39,7 @@
                     width="30"
                     mouse_opaque="false">
         <toolbar follows="left|top|bottom"
+                 button_panel.bg_opaque_image="Rounded_Rect_Right"
                  name="toolbar_left"
                  height="500"
                  width="30"
@@ -59,6 +60,7 @@
                     width="30"
                     mouse_opaque="false">
         <toolbar
+          button_panel.bg_opaque_image="Rounded_Rect_Left"
           follows="right|top|bottom"
           name="toolbar_right"
           height="500"
@@ -78,6 +80,7 @@
                 width="1024"
                 mouse_opaque="false">
     <toolbar layout="topleft"
+             button_panel.bg_opaque_image="Rounded_Rect_Top"
              name="toolbar_bottom"
              height="30"
              width="1024"
diff --git a/indra/newview/skins/default/xui/en/widgets/toolbar.xml b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
index d16d70cb43..8422e3943d 100644
--- a/indra/newview/skins/default/xui/en/widgets/toolbar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
@@ -1,23 +1,33 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<toolbar button_height="30"
-         pad_left="5"
-         pad_right="5"
-         pad_top="5"
-         pad_bottom="5"
-         pad_between="5"
+<toolbar pad_left="1"
+         pad_right="1"
+         pad_top="1"
+         pad_bottom="1"
+         pad_between="1"
          mouse_opaque="false"
          read_only="false">
   <button_panel name="button_panel"
                 bg_opaque_image="Rounded_Rect"
                 background_visible="true"
-                bg_opaque_color="MouseGray"
+                bg_opaque_image_overlay="MouseGray"
                 background_opaque="true"/>
-  <button_icon_and_text follows="left|top"
+  <button_icon_and_text imgoverlay_label_space="7"
+                        min_button_width="70"
+                        max_button_width="140"
+                        desired_height="24"
+                        pad_left="10" 
+                        pad_right="10"
+                        follows="left|top"
                         chrome="true"
                         image_overlay_alignment="left"
                         use_ellipses="true"
                         auto_resize="true"/>
-  <button_icon follows="left|top"
+  <button_icon pad_left="10"
+               pad_right="10"
+               desired_height="35"
+               min_button_width="35"
+               max_button_width="35"               
+               follows="left|top"
                label=""
                chrome="true"
                use_ellipses="true"
-- 
cgit v1.2.3


From 37fdd27bcbd38b5cf22e0ff003f4d01b908996c7 Mon Sep 17 00:00:00 2001
From: Richard Nelson <richard@lindenlab.com>
Date: Mon, 3 Oct 2011 11:28:22 -0700
Subject: updated xui for toybox to reflect changes to param blocks

---
 indra/newview/skins/default/xui/en/floater_toybox.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_toybox.xml b/indra/newview/skins/default/xui/en/floater_toybox.xml
index feb19571b2..de39032cbf 100644
--- a/indra/newview/skins/default/xui/en/floater_toybox.xml
+++ b/indra/newview/skins/default/xui/en/floater_toybox.xml
@@ -48,8 +48,8 @@
     button_display_mode="icons_with_text"
     follows="all"
     left="20"
-    max_button_width="140"
-    min_button_width="70"
+    button_icon_and_text.max_button_width="140"
+    button_icon_and_text.min_button_width="70"
     name="toybox_toolbar"
     pad_left="5"
     pad_right="5"
-- 
cgit v1.2.3


From edacb7b3363dca6cd28a4ff7ea27154d6a30702f Mon Sep 17 00:00:00 2001
From: Richard Nelson <richard@lindenlab.com>
Date: Mon, 3 Oct 2011 18:52:22 -0700
Subject: implemented Range and ClampedValue classes to standardize min/max
 settings fixed not serializing named values when values provided from code

---
 indra/newview/skins/default/xui/en/floater_toybox.xml  | 4 ++--
 indra/newview/skins/default/xui/en/widgets/toolbar.xml | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_toybox.xml b/indra/newview/skins/default/xui/en/floater_toybox.xml
index de39032cbf..972ae1487a 100644
--- a/indra/newview/skins/default/xui/en/floater_toybox.xml
+++ b/indra/newview/skins/default/xui/en/floater_toybox.xml
@@ -48,8 +48,8 @@
     button_display_mode="icons_with_text"
     follows="all"
     left="20"
-    button_icon_and_text.max_button_width="140"
-    button_icon_and_text.min_button_width="70"
+    button_icon_and_text.button_width.max="140"
+    button_icon_and_text.button_width.min="70"
     name="toybox_toolbar"
     pad_left="5"
     pad_right="5"
diff --git a/indra/newview/skins/default/xui/en/widgets/toolbar.xml b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
index 8422e3943d..0c7e7cff56 100644
--- a/indra/newview/skins/default/xui/en/widgets/toolbar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
@@ -12,8 +12,8 @@
                 bg_opaque_image_overlay="MouseGray"
                 background_opaque="true"/>
   <button_icon_and_text imgoverlay_label_space="7"
-                        min_button_width="70"
-                        max_button_width="140"
+                        button_width.min="70"
+                        button_width.max="140"
                         desired_height="24"
                         pad_left="10" 
                         pad_right="10"
@@ -25,8 +25,8 @@
   <button_icon pad_left="10"
                pad_right="10"
                desired_height="35"
-               min_button_width="35"
-               max_button_width="35"               
+               button_width.min="35"
+               button_width.max="35"               
                follows="left|top"
                label=""
                chrome="true"
-- 
cgit v1.2.3


From 530d5af4073f4dda4003005c9c117af53b84aa9d Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Tue, 4 Oct 2011 12:05:27 -0700
Subject: EXP-1204 PROGRESS -- As a User I want flexible floater management
 with no sidetray EXP-1292 FIX -- Mini-map floater can't be closed by clicking
 the sidebar button again.

* Mini-map floater text updated
* Mini-map floater behavior now acts more like other windows, has a title, etc.
---
 indra/newview/skins/default/xui/en/floater_map.xml | 28 ++++++++++------------
 .../skins/default/xui/en/menu_bottomtray.xml       |  2 +-
 indra/newview/skins/default/xui/en/menu_viewer.xml |  2 +-
 .../skins/default/xui/en/panel_bottomtray.xml      |  4 ++--
 4 files changed, 16 insertions(+), 20 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_map.xml b/indra/newview/skins/default/xui/en/floater_map.xml
index ae99fa8dd5..51f63edc31 100644
--- a/indra/newview/skins/default/xui/en/floater_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_map.xml
@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
- bg_alpha_image_overlay="DkGray_66"
- legacy_header_height="0"
  can_minimize="true" 
  can_resize="true"
  follows="top|right"
- height="174"
+ height="200"
  layout="topleft"
  min_height="128"
  min_width="128"
  name="Map"
- title=""
+ title="Mini-map"
  help_topic="map"
  save_rect="true"
  save_visibility="true"
- single_instance="true"
  left="0"
  top="0"
  width="200">
@@ -27,17 +24,16 @@
 		[REGION](Double-click to teleport, shift-drag to pan)
 	</floater.string>
 	<floater.string name="mini_map_caption">
-	MINIMAP
+	Mini-map
     </floater.string>
     <net_map
-     bg_color="NetMapBackgroundColor"
      follows="top|left|bottom|right"
      layout="topleft"
      left="0"
      mouse_opaque="false"
      name="Net Map"
      width="200"
-     height="218"
+     height="200"
      top="0"/>
     <text
      type="string"
@@ -49,7 +45,7 @@
      name="floater_map_north"
      right="10"
      text_color="1 1 1 0.7"
-     top="209">
+     top="189">
         N
     </text>
     <text
@@ -62,7 +58,7 @@
      name="floater_map_east"
      right="10"
      text_color="1 1 1 0.7"
-     top="209">
+     top="189">
         E
     </text>
     <text
@@ -75,7 +71,7 @@
      name="floater_map_west"
      right="11"
      text_color="1 1 1 0.7"
-     top="195">
+     top="175">
         W
     </text>
     <text
@@ -88,7 +84,7 @@
      name="floater_map_south"
      right="10"
      text_color="1 1 1 0.7"
-     top="209">
+     top="189">
         S
     </text>
     <text
@@ -101,7 +97,7 @@
      name="floater_map_southeast"
      right="20"
      text_color="1 1 1 0.7"
-     top="209">
+     top="189">
         SE
     </text>
     <text
@@ -114,7 +110,7 @@
      name="floater_map_northeast"
      right="20"
      text_color="1 1 1 0.7"
-     top="209">
+     top="189">
         NE
     </text>
     <text
@@ -127,7 +123,7 @@
      name="floater_map_southwest"
      right="20"
      text_color="1 1 1 0.7"
-     top="209">
+     top="189">
         SW
     </text>
     <text
@@ -140,7 +136,7 @@
      name="floater_map_northwest"
      right="20"
      text_color="1 1 1 0.7"
-     top="209">
+     top="189">
         NW
     </text>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/menu_bottomtray.xml b/indra/newview/skins/default/xui/en/menu_bottomtray.xml
index 07dabe1909..1a102c21bb 100644
--- a/indra/newview/skins/default/xui/en/menu_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/menu_bottomtray.xml
@@ -97,7 +97,7 @@
          parameter="ShowWorldMapButton" />
     </menu_item_check>
     <menu_item_check
-     label="Mini-Map button"
+     label="Mini-map button"
      layout="topleft"
      name="ShowMiniMapButton">
         <menu_item_check.on_click
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 733b97d827..1ba204473f 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -257,7 +257,7 @@
      name="World"
      tear_off="true">
             <menu_item_check
-         label="Mini-Map"
+         label="Mini-map"
          name="Mini-Map"
          shortcut="control|shift|M">
             <menu_item_check.on_check
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index ec5853649e..2737746c0e 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -353,11 +353,11 @@ Disabled for now.
              image_pressed_selected="PushButton_Selected_Press"
              image_selected="PushButton_Selected_Press"
              is_toggle="true"
-             label="Mini-Map"
+             label="Mini-map"
              layout="topleft"
              left="0"
              name="mini_map_btn"
-             tool_tip="Shows/hides Mini-Map"
+             tool_tip="Shows/hides mini-map"
              top="5"
              use_ellipses="true"
              width="80">
-- 
cgit v1.2.3


From 05879242832607795040573791b0790891367b81 Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Tue, 4 Oct 2011 14:55:55 -0700
Subject: * Updating "Move" floater to be more FUI-like

---
 indra/newview/skins/default/xui/en/floater_moveview.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_moveview.xml b/indra/newview/skins/default/xui/en/floater_moveview.xml
index 6f29255a6b..3c0905a2a5 100644
--- a/indra/newview/skins/default/xui/en/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/en/floater_moveview.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  legacy_header_height="18"
- can_dock="true"
+ can_dock="false"
  can_minimize="true"
- can_close="false"
+ can_close="true"
  follows="bottom"
  height="110"
  layout="topleft"
@@ -12,6 +12,7 @@
  save_rect="true"
  save_visibility="true"
  save_dock_state="true"
+ title="Move"
  width="133">
     <string
      name="walk_forward_tooltip">
-- 
cgit v1.2.3


From 4ee79abdca66f73aaba25ebf0b874bd422db46f6 Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Tue, 4 Oct 2011 15:21:13 -0700
Subject: Renamed PREFERENCES

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

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index dcfa8bc060..c8a139904a 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -8,7 +8,7 @@
  name="Preferences"
  help_topic="preferences"
  single_instance="true"
- title="PREFERENCES"
+ title="Preferences"
  width="658">
     <button
      follows="right|bottom"
-- 
cgit v1.2.3