From 0a7290772a6b39555adb966c7a48ef44151c1f05 Mon Sep 17 00:00:00 2001
From: richard <none@none>
Date: Thu, 5 Nov 2009 15:36:11 -0800
Subject: moved scroll_column_header default params to scroll_column_header.xml
 reviewed by James

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/widgets/scroll_column_header.xml b/indra/newview/skins/default/xui/en/widgets/scroll_column_header.xml
new file mode 100644
index 0000000000..0794b49a0c
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/scroll_column_header.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<scroll_column_header image_unselected="square_btn_32x128.tga"
+                      image_selected="square_btn_selected_32x128.tga"
+                      image_disabled="square_btn_32x128.tga"
+                      image_disabled_selected="square_btn_selected_32x128.tga"
+                      image_overlay="combobox_arrow.tga"
+                      image_overlay_alignment="right"
+                      halign="left"
+                      scale_image="true"/>
-- 
cgit v1.2.3


From 29d8ee76f12e151c0e305933cc7de2daed661430 Mon Sep 17 00:00:00 2001
From: richard <none@none>
Date: Thu, 5 Nov 2009 16:30:11 -0800
Subject: LLChiclet cleans up its connection to LLTransientFloaterMgr now and
 panel_stand_stop_flying is visible by default while its contents are not

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml
index c8703aa895..b48943c699 100644
--- a/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml
+++ b/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml
@@ -5,7 +5,7 @@
  layout="topleft"
  name="panel_stand_stop_flying"
  mouse_opaque="false"
- visible="false"
+ visible="true"
  width="115">
     <button
      follows="left|bottom"
-- 
cgit v1.2.3


From fac0b6836a59681443fb2bbd13e6b5eb9c07cef5 Mon Sep 17 00:00:00 2001
From: richard <none@none>
Date: Thu, 5 Nov 2009 20:36:15 -0800
Subject: refactored top level ui into main_view.xml

---
 indra/newview/skins/default/xui/en/floater_aaa.xml |  21 +---
 indra/newview/skins/default/xui/en/main_view.xml   | 138 +++++++++++++++++++++
 2 files changed, 141 insertions(+), 18 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/main_view.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_aaa.xml b/indra/newview/skins/default/xui/en/floater_aaa.xml
index 4d5268681b..d0d0cc64c5 100644
--- a/indra/newview/skins/default/xui/en/floater_aaa.xml
+++ b/indra/newview/skins/default/xui/en/floater_aaa.xml
@@ -1,24 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
- legacy_header_height="18"
- height="440"
+ height="768"
  layout="topleft"
  name="floater_aaa"
- help_topic="floater_aaa"
- save_rect="true"
  can_resize="true" 
- title="ABOUT [APP_NAME]"
- width="470">
-    <text_editor
-     follows="left|top|right|bottom"
-     height="400"
-     layout="topleft"
-     left="6"
-     max_length="65536"
-     name="credits_editor"
-     top="25"
-     width="458"
-     word_wrap="true">
-This is line 4
-    </text_editor>
+ width="1024">
+  <panel filename="main_view.xml" follows="all" width="1024" height="768" top="0"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml
new file mode 100644
index 0000000000..2d69465b58
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/main_view.xml
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ follows="left|right|top|bottom"
+ height="768" 
+ layout="topleft"
+ left="0"
+ mouse_opaque="false"
+ name="screen"
+ width="1024">
+  <layout_stack border_size="0"
+                follows="all"
+                height="768" 
+                mouse_opaque="false" 
+                name="menu_stack"
+                orientation="vertical">
+    <!-- filename="panel_status_bar.xml"-->
+    <layout_panel auto_resize="false"
+                  mouse_opaque="false"
+                  name="status_bar_container"
+                  width="1024"
+                  visible="false"/>
+    <!--filename="panel_navigation_bar.xml"-->
+    <layout_panel auto_resize="false"
+                  height="65" 
+                  mouse_opaque="false" 
+                  name="nav_bar_container"
+                  width="1024"
+                  visible="false"/>
+    <layout_stack auto_resize="true" 
+                  border_size="0" 
+                  follows="all" 
+                  height="500" 
+                  mouse_opaque="false"
+                  name="hud_stack" 
+                  orientation="horizontal" 
+                  width="1024">
+      <panel auto_resize="true" 
+             follows="all" 
+             height="500" 
+             layout="topleft" 
+             mouse_opaque="false"
+             name="main_view" 
+             user_resize="true" 
+             width="500">
+        <layout_stack bottom="500" 
+                      follows="all" 
+                      height="500"
+                      mouse_opaque="false"
+                      name="hud_stack" 
+                      orientation="vertical">
+          <panel auto_resize="true" 
+                 follows="all" 
+                 height="500" 
+                 layout="topleft" 
+                 mouse_opaque="false"
+                 name="hud container" 
+                 width="500">
+            <debug_view follows="all"
+                        left="0" 
+                        top="0"
+                        mouse_opaque="false" 
+                        height="500"
+                        name="DebugView"
+                        width="500"/>
+
+              <panel follows="right|top|bottom" 
+                     height="500" 
+                     mouse_opaque="false"
+                     name="side_bar_tabs" 
+                     right="500" 
+                     top="0" 
+                     width="32"/>
+          </panel>
+          <!--filename="panel_stand_stop_flying.xml"-->
+          <layout_panel auto_resize="false"
+                 follows="all"
+                 min_height="25"
+                 mouse_opaque="false"
+                 name="stand_stop_flying_container"
+                 visible="false"/>
+          <!--filename="panel_bottomtray.xml"-->
+          <layout_panel auto_resize="false" 
+                 follows="all" 
+                 min_height="33" 
+                 mouse_opaque="false"
+                 name="bottom_tray_container"
+                 visible="false"/>
+        </layout_stack>
+        <floater_view follows="all" 
+                      height="500" 
+                      mouse_opaque="false" 
+                      name="Floater View"
+                      tab_group="-1" 
+                      tab_stop="false"
+                      top="0"/>
+        <snapshot_floater_view enabled="false"
+                               follows="all"
+                               height="500"
+                               left="0" 
+                               mouse_opaque="false"
+                               name="Snapshot Floater View"
+                               tab_stop="false"
+                               top="0"
+                               visible="false"/>
+      </panel>
+      <!-- side tray -->
+      <layout_panel auto_resize="false" 
+                    follows="all" 
+                    height="500" 
+                    min_width="333" 
+                    mouse_opaque="false"
+                    name="side_tray_container" 
+                    user_resize="true"
+                    visible="false" 
+                    width="333"/>
+    </layout_stack>
+  </layout_stack>
+  <notify_box_view top="0"
+                   follows="all"
+                   height="768"
+                   mouse_opaque="false"
+                   name="notify_container"
+                   tab_group="-2"
+                   width="1024"/>
+  <menu_holder top="0"
+               follows="all"
+               height="768"
+               mouse_opaque="false"
+               name="Menu Holder"
+               width="1024"/>
+  <tooltip_view top="0"
+                follows="all"
+                height="768"
+                mouse_opaque="false"
+                name="tooltip view"
+                tab_group="-2"
+                width="1024"/>
+</panel>
-- 
cgit v1.2.3


From 4eb72a12a2280d3be6ac556ad80eb953d249e8eb Mon Sep 17 00:00:00 2001
From: richard <none@none>
Date: Mon, 9 Nov 2009 15:29:47 -0800
Subject: data driven layout of top-level UI elements EXT-1219 Side tray
 slide-out animation cleaned up some layout of bottom tray contents

reviewed by James
---
 indra/newview/skins/default/xui/en/main_view.xml   | 203 ++++++++++++---------
 .../skins/default/xui/en/panel_bottomtray.xml      |  51 +++---
 .../skins/default/xui/en/panel_status_bar.xml      |   2 +-
 .../skins/default/xui/en/widgets/context_menu.xml  |   2 +
 .../skins/default/xui/en/widgets/side_tray.xml     |   9 +-
 .../default/xui/en/widgets/toggleable_menu.xml     |   2 +
 6 files changed, 150 insertions(+), 119 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/widgets/context_menu.xml
 create mode 100644 indra/newview/skins/default/xui/en/widgets/toggleable_menu.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml
index 2d69465b58..08f7ee456e 100644
--- a/indra/newview/skins/default/xui/en/main_view.xml
+++ b/indra/newview/skins/default/xui/en/main_view.xml
@@ -1,119 +1,130 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
  follows="left|right|top|bottom"
- height="768" 
+ height="768"
  layout="topleft"
  left="0"
  mouse_opaque="false"
- name="screen"
+ name="main_view"
  width="1024">
   <layout_stack border_size="0"
                 follows="all"
-                height="768" 
-                mouse_opaque="false" 
+                mouse_opaque="false"
+                height="772"
                 name="menu_stack"
-                orientation="vertical">
-    <!-- filename="panel_status_bar.xml"-->
+                orientation="vertical"
+                top="0">
     <layout_panel auto_resize="false"
+                  min_height="19"
                   mouse_opaque="false"
                   name="status_bar_container"
+                  height="19"
                   width="1024"
                   visible="false"/>
-    <!--filename="panel_navigation_bar.xml"-->
     <layout_panel auto_resize="false"
-                  height="65" 
-                  mouse_opaque="false" 
+                  height="65"
+                  mouse_opaque="false"
                   name="nav_bar_container"
                   width="1024"
                   visible="false"/>
-    <layout_stack auto_resize="true" 
-                  border_size="0" 
-                  follows="all" 
-                  height="500" 
+    <panel        auto_resize="true"
+                  follows="all"
+                  height="500"
+                  layout="topleft"
                   mouse_opaque="false"
-                  name="hud_stack" 
-                  orientation="horizontal" 
+                  name="hud"
                   width="1024">
-      <panel auto_resize="true" 
-             follows="all" 
-             height="500" 
-             layout="topleft" 
-             mouse_opaque="false"
-             name="main_view" 
-             user_resize="true" 
-             width="500">
-        <layout_stack bottom="500" 
-                      follows="all" 
-                      height="500"
-                      mouse_opaque="false"
-                      name="hud_stack" 
-                      orientation="vertical">
-          <panel auto_resize="true" 
-                 follows="all" 
-                 height="500" 
-                 layout="topleft" 
-                 mouse_opaque="false"
-                 name="hud container" 
-                 width="500">
-            <debug_view follows="all"
-                        left="0" 
-                        top="0"
-                        mouse_opaque="false" 
+      <layout_stack border_size="0"
+                    follows="all"
+                    height="500"
+                    left="0"
+                    mouse_opaque="false"
+                    name="hud_stack"
+                    orientation="horizontal"
+                    top="0"
+                    width="1024">
+        <panel auto_resize="true"
+               follows="all"
+               height="500"
+               layout="topleft"
+               mouse_opaque="false"
+               name="main_view"
+               user_resize="true"
+               width="500">
+          <layout_stack border_size="0"
+                        bottom="500"
+                        follows="all"
                         height="500"
-                        name="DebugView"
-                        width="500"/>
-
-              <panel follows="right|top|bottom" 
-                     height="500" 
+                        left="0"
+                        mouse_opaque="false"
+                        name="world_stack"
+                        orientation="vertical">
+            <panel auto_resize="true"
+                   follows="all"
+                   height="500"
+                   layout="topleft"
+                   mouse_opaque="false"
+                   name="hud container"
+                   width="500">
+              <view bottom="500"
+                    follows="all"
+                    height="500"
+                    left="0"
+                    mouse_opaque="false"
+                    name="world_view_rect"
+                    width="500"/>
+              <panel follows="right|top|bottom"
+                     height="500"
                      mouse_opaque="false"
-                     name="side_bar_tabs" 
-                     right="500" 
-                     top="0" 
+                     name="side_bar_tabs"
+                     right="500"
+                     top="0"
                      width="32"/>
-          </panel>
-          <!--filename="panel_stand_stop_flying.xml"-->
-          <layout_panel auto_resize="false"
-                 follows="all"
-                 min_height="25"
-                 mouse_opaque="false"
-                 name="stand_stop_flying_container"
-                 visible="false"/>
-          <!--filename="panel_bottomtray.xml"-->
-          <layout_panel auto_resize="false" 
-                 follows="all" 
-                 min_height="33" 
-                 mouse_opaque="false"
-                 name="bottom_tray_container"
-                 visible="false"/>
-        </layout_stack>
-        <floater_view follows="all" 
-                      height="500" 
-                      mouse_opaque="false" 
-                      name="Floater View"
-                      tab_group="-1" 
-                      tab_stop="false"
-                      top="0"/>
-        <snapshot_floater_view enabled="false"
-                               follows="all"
-                               height="500"
-                               left="0" 
-                               mouse_opaque="false"
-                               name="Snapshot Floater View"
-                               tab_stop="false"
-                               top="0"
-                               visible="false"/>
-      </panel>
-      <!-- side tray -->
-      <layout_panel auto_resize="false" 
-                    follows="all" 
-                    height="500" 
-                    min_width="333" 
+              <panel bottom="500"
+                     follows="left|right|bottom"
+                     height="25"
+                     left="0"
+                     mouse_opaque="false"
+                     name="stand_stop_flying_container"
+                     visible="false"
+                     width="500"/>
+            </panel>
+            <layout_panel auto_resize="false"
+                   follows="all"
+                   min_height="33"
+                   mouse_opaque="false"
+                   name="bottom_tray_container"
+                   visible="false"/>
+          </layout_stack>
+        </panel>
+        <!-- side tray -->
+        <layout_panel auto_resize="false"
+                      follows="all"
+                      height="500"
+                      min_width="333"
+                      mouse_opaque="false"
+                      name="side_tray_container"
+                      user_resize="true"
+                      visible="false"
+                      width="333"/>
+      </layout_stack>
+      <floater_view follows="all"
+                    height="500"
+                    left="0"
                     mouse_opaque="false"
-                    name="side_tray_container" 
-                    user_resize="true"
-                    visible="false" 
-                    width="333"/>
-    </layout_stack>
+                    name="Floater View"
+                    tab_group="-1"
+                    tab_stop="false"
+                    top="0"
+                    width="1024"/>
+      <debug_view follows="all"
+                  left="0"
+                  top="0"
+                  mouse_opaque="false"
+                  height="500"
+                  name="DebugView"
+                  width="1024"/>
+  </panel>
   </layout_stack>
   <notify_box_view top="0"
                    follows="all"
@@ -128,6 +139,16 @@
                mouse_opaque="false"
                name="Menu Holder"
                width="1024"/>
+  <snapshot_floater_view enabled="false"
+                         follows="all"
+                         height="768"
+                         left="0"
+                         mouse_opaque="false"
+                         name="Snapshot Floater View"
+                         tab_stop="false"
+                         top="0"
+                         visible="false"
+                         width="1024"/>
   <tooltip_view top="0"
                 follows="all"
                 height="768"
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index f833e0a1cb..faa38084f1 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -31,6 +31,7 @@
          height="10"
          image_name="spacer24.tga"
          layout="topleft"
+         min_width="4"
          left="0"
          top="0"
          width="4" />
@@ -44,7 +45,7 @@
          min_height="23"
          width="310"
          top="0"
-         min_width="300"
+         min_width="310"
          name="chat_bar"
          user_resize="false"
          filename="panel_nearby_chat_bar.xml" />
@@ -57,30 +58,31 @@
          min_height="28"
          width="100"
          top_delta="0"
-         min_width="96"
+         min_width="100"
          name="speak_panel"
          user_resize="false">
-         <talk_button
-          follows="right"
-          height="23"
-          speak_button.tab_stop="true"
-          show_button.tab_stop="true"
-          layout="topleft"
-          left="0"
-          name="talk"
-          top="3"
-          width="100" />
+          <talk_button
+           follows="right"
+           height="23"
+           speak_button.tab_stop="true"
+           show_button.tab_stop="true"
+           layout="topleft"
+           left="0"
+           name="talk"
+           top="3"
+           width="100" />
         </layout_panel>
-		 <icon
-         auto_resize="false"
-         follows="left|right"
-         height="10"
-         image_name="spacer24.tga"
-         layout="topleft"
-         left="0"
-         name="DUMMY"
-         top="0"
-         width="4"/>
+        <icon
+            auto_resize="false"
+            follows="left|right"
+            height="10"
+            image_name="spacer24.tga"
+            layout="topleft"
+            left="0"
+            name="DUMMY"
+            min_width="4"
+            top="0"
+            width="4"/>
         <layout_panel
          mouse_opaque="false"
          auto_resize="false"
@@ -112,6 +114,7 @@
          image_name="spacer24.tga"
          layout="topleft"
          left="0"
+         min_width="4" 
          name="DUMMY"
          top="0"
          width="4"/>
@@ -149,6 +152,7 @@
          image_name="spacer24.tga"
          layout="topleft"
          left="0"
+         min_width="4" 
          name="DUMMY"
          top="0"
          width="4"/>
@@ -188,6 +192,7 @@
          image_name="spacer24.tga"
          layout="topleft"
          left="0"
+         min_width="4" 
          name="DUMMY"
          top="0"
          width="4"/>
@@ -243,6 +248,7 @@
          image_name="spacer24.tga"
          layout="topleft"
          left="0"
+         min_width="4" 
          top="0"
          width="5"/>
         <layout_panel
@@ -288,6 +294,7 @@
          height="10"
          image_name="spacer24.tga"
          layout="topleft"
+         min_width="4" 
          right="-1"
          top="0"
          width="26"/>
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 7b9c9f47a2..1171a8f0b5 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -3,7 +3,7 @@
  background_opaque="true"
  background_visible="true"
  bg_opaque_color="MouseGray"
- follows="top|left|right"
+ follows="all"
  height="19"
  layout="topleft"
  left="0"
diff --git a/indra/newview/skins/default/xui/en/widgets/context_menu.xml b/indra/newview/skins/default/xui/en/widgets/context_menu.xml
new file mode 100644
index 0000000000..459706c689
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/context_menu.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<context_menu visible="false"/>
diff --git a/indra/newview/skins/default/xui/en/widgets/side_tray.xml b/indra/newview/skins/default/xui/en/widgets/side_tray.xml
index 8b4a5afbe9..022564c12f 100644
--- a/indra/newview/skins/default/xui/en/widgets/side_tray.xml
+++ b/indra/newview/skins/default/xui/en/widgets/side_tray.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <side_tray tab_btn_image="TaskPanel_Tab_Off"
-        tab_btn_image_selected="TaskPanel_Tab_Selected"
-		tab_btn_width="32"
-		tab_btn_height="40"
-		tab_btn_margin="1"
-        >
+           tab_btn_image_selected="TaskPanel_Tab_Selected"
+           tab_btn_width="32"
+           tab_btn_height="40"
+           tab_btn_margin="1">
 </side_tray>
diff --git a/indra/newview/skins/default/xui/en/widgets/toggleable_menu.xml b/indra/newview/skins/default/xui/en/widgets/toggleable_menu.xml
new file mode 100644
index 0000000000..48950a98ad
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/toggleable_menu.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu visible="false"/>
-- 
cgit v1.2.3


From 2bc97bd68a774dd373c5688b5dc660abe90b37cc Mon Sep 17 00:00:00 2001
From: richard <none@none>
Date: Mon, 9 Nov 2009 16:01:21 -0800
Subject: renamed LLLayoutStack::idle to LLLayoutStack::updateClass converted
 mWorldViewPlaceholder to a LLHandle<LLView> improved layout of
 panel_bottomtray

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index faa38084f1..d990ebfd4a 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -56,9 +56,9 @@
          height="28"
          layout="topleft"
          min_height="28"
-         width="100"
+         width="104"
          top_delta="0"
-         min_width="100"
+         min_width="104"
          name="speak_panel"
          user_resize="false">
           <talk_button
-- 
cgit v1.2.3


From 5292a3181191179de180fd36bd248a3dba6113b1 Mon Sep 17 00:00:00 2001
From: angela <angela@lindenlab.com>
Date: Tue, 10 Nov 2009 14:45:10 +0800
Subject: EXT-2078

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index c5e129cf2f..dbbf7ebede 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -203,7 +203,7 @@
          name="snapshot_panel"
          width="40">
             <button
-         follows="left|right"
+			 follows="left|right"
              height="23"
              left="0"
              label=""
@@ -212,9 +212,12 @@
              width="36"
              top="3"
              image_overlay="Snapshot_Off"
-            tool_tip="Take snapshot"
-                 />
-        </layout_panel>
+             tool_tip="Take snapshot">
+				<button.commit_callback
+				 function="Floater.Toggle"
+				 parameter="snapshot" />
+			</button>
+		</layout_panel>
         <layout_panel
          mouse_opaque="false"
          follows="left|right"
-- 
cgit v1.2.3


From 26d481f3850ded5a20e183260eced4c32c9b7a84 Mon Sep 17 00:00:00 2001
From: angela <angela@lindenlab.com>
Date: Tue, 10 Nov 2009 22:49:25 +0800
Subject: (EXT-2343) Preference > Chat > ColorSwatch 's LLUIColorTable is not
 working

---
 .../default/xui/en/panel_preferences_chat.xml      | 82 +++++++++++++++++-----
 1 file changed, 65 insertions(+), 17 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index 645863e7a4..5a4b0a3892 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -45,14 +45,20 @@
     <color_swatch
      border_color="0.45098 0.517647 0.607843 1"
      can_apply_immediately="true"
-     control_name="UserChatColor"
      follows="left|top"
      height="47"
      layout="topleft"
      left="30"
      name="user"
      top_pad="10"
-     width="44" />
+     width="44" >
+		<color_swatch.init_callback
+		 function="Pref.getUIColor"
+		 parameter="UserChatColor" />
+		<color_swatch.commit_callback
+		 function="Pref.applyUIColor"
+		 parameter="UserChatColor" />
+	</color_swatch>
     <text
      type="string"
      length="1"
@@ -69,14 +75,20 @@
     <color_swatch
      border_color="0.45098 0.517647 0.607843 1"
      can_apply_immediately="true"
-     control_name="AgentChatColor"
      follows="left|top"
      height="47"
      layout="topleft"
      left="180"
      name="agent"
      top_pad="-17"
-     width="44" />
+     width="44" >
+		<color_swatch.init_callback
+		 function="Pref.getUIColor"
+		 parameter="AgentChatColor" />
+		<color_swatch.commit_callback
+		 function="Pref.applyUIColor"
+		 parameter="AgentChatColor" />
+	</color_swatch>
     <text
      type="string"
      length="1"
@@ -94,7 +106,6 @@
      border_color="0.45098 0.517647 0.607843 1"
      can_apply_immediately="true"
      color="0.6 0.6 1 1"
-     control_name="IMChatColor"
      follows="left|top"
      height="47"
      label_width="60"
@@ -102,8 +113,15 @@
      left="350"
      name="im"
      top_pad="-17"
-     width="44" />
-        <text
+     width="44">
+		<color_swatch.init_callback
+		 function="Pref.getUIColor"
+		 parameter="IMChatColor" />
+		<color_swatch.commit_callback
+		 function="Pref.applyUIColor"
+		 parameter="IMChatColor" />
+	</color_swatch>
+	<text
      type="string"
      length="1"
      follows="left|top"
@@ -120,7 +138,6 @@
      border_color="0.45098 0.517647 0.607843 1"
      can_apply_immediately="true"
      color="0.8 1 1 1"
-     control_name="SystemChatColor"
      follows="left|top"
      height="47"
      label_width="44"
@@ -128,7 +145,14 @@
      left="30"
      name="system"
      top_pad="40"
-     width="44" />
+     width="44" >
+		<color_swatch.init_callback
+		 function="Pref.getUIColor"
+		 parameter="SystemChatColor" />
+		<color_swatch.commit_callback
+		 function="Pref.applyUIColor"
+		 parameter="SystemChatColor" />
+	</color_swatch>
     <text
      type="string"
      length="1"
@@ -146,14 +170,20 @@
      border_color="0.45098 0.517647 0.607843 1"
      can_apply_immediately="true"
      color="0.82 0.82 0.99 1"
-     control_name="ScriptErrorColor"
      follows="left|top"
      height="47"
      layout="topleft"
      left="180"
      name="script_error"
      top_pad="-17"
-     width="44" />
+     width="44">
+		<color_swatch.init_callback
+		 function="Pref.getUIColor"
+		 parameter="ScriptErrorColor" />
+		<color_swatch.commit_callback
+		 function="Pref.applyUIColor"
+		 parameter="ScriptErrorColor" />
+	</color_swatch>
     <text
      type="string"
      length="1"
@@ -171,14 +201,20 @@
      border_color="0.45098 0.517647 0.607843 1"
      can_apply_immediately="true"
      color="0.7 0.9 0.7 1"
-     control_name="ObjectChatColor"
      follows="left|top"
      height="47"
      layout="topleft"
      left="350"
      name="objects"
      top_pad="-17"
-     width="44" />
+     width="44" >
+		<color_swatch.init_callback
+		 function="Pref.getUIColor"
+		 parameter="ObjectChatColor" />
+		<color_swatch.commit_callback
+		 function="Pref.applyUIColor"
+		 parameter="ObjectChatColor" />
+	</color_swatch>
     <text
      type="string"
      length="1"
@@ -196,14 +232,20 @@
      border_color="0.45098 0.517647 0.607843 1"
      can_apply_immediately="true"
      color="0.7 0.9 0.7 1"
-     control_name="llOwnerSayChatColor"
      follows="left|top"
      height="47"
      layout="topleft"
      left="30"
      name="owner"
      top_pad="40"
-     width="44" />
+     width="44" >
+		<color_swatch.init_callback
+		 function="Pref.getUIColor"
+		 parameter="llOwnerSayChatColor" />
+		<color_swatch.commit_callback
+		 function="Pref.applyUIColor"
+		 parameter="llOwnerSayChatColor" />
+	</color_swatch>
     <text
      type="string"
      length="1"
@@ -221,14 +263,20 @@
      border_color="0.45098 0.517647 0.607843 1"
      can_apply_immediately="true"
      color="0.6 0.6 1 1"
-     control_name="HTMLLinkColor"
      follows="left|top"
      height="47"
      layout="topleft"
      left="180"
      name="links"
      top_pad="-17"
-     width="44" />
+     width="44" >
+		<color_swatch.init_callback
+		 function="Pref.getUIColor"
+		 parameter="HTMLLinkColor" />
+		<color_swatch.commit_callback
+		 function="Pref.applyUIColor"
+		 parameter="HTMLLinkColor" />
+	</color_swatch>
     <text
      type="string"
      length="1"
-- 
cgit v1.2.3


From def4a6aeea35fbced77894fb6577ad2889c877b3 Mon Sep 17 00:00:00 2001
From: "Justin C. Rounds (Chuck)" <chuck@lindenlab.com>
Date: Tue, 10 Nov 2009 13:17:49 -0500
Subject: Changed value of "Unused?" to modify highlight color.
 http://jira.secondlife.com/browse/EXT-2312

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 572a4cf9e9..7e19a80c10 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -70,7 +70,7 @@
 	 value="1 1 0 1" />
 	<color
 	 name="Unused?"
-	 value="1 0 1 1" />
+	 value="1 0.5 0 1" />
 	<color
 	 name="Transparent"
 	 value="0 0 0 0" />
-- 
cgit v1.2.3


From 162924aadfb6a7312287d91a25a129885239c0a4 Mon Sep 17 00:00:00 2001
From: Lynx Linden <lynx@lindenlab.com>
Date: Tue, 10 Nov 2009 18:53:07 +0000
Subject: DEV-41317 DEV-42311: Added ad-hoc voice call support.

You can now multiple select users in the People panel, hit Call, and
start an ad-hoc voice conference call with those users.

The most difficult part here was automatically starting the call once
the conference chat panel popped up. We have to wait for the panel to
initialize before we can start a call, so I added another callback to
LLIMModel to enable us to get notified when the panel has initialized.
This is all wrapped up behind a new LLAvatarActions::startAdhocCall()
API.
---
 indra/newview/skins/default/xui/en/strings.xml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index c850dce141..b0a406a277 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2863,6 +2863,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
   <string name="answering-im">
     Connecting...
   </string>
+  <string name="conference-title">
+    Friends Conference
+  </string>
   <string name="inventory_item_offered-im">
     Inventory item offered
   </string>
-- 
cgit v1.2.3


From ecf8f5c5beda9f5fa743c4666717c4378f204023 Mon Sep 17 00:00:00 2001
From: Lis Pardi <lis@lindenlab.com>
Date: Tue, 10 Nov 2009 15:01:29 -0500
Subject: EXT-1503 Cosmetic and Polish issues with Viewer 2.0 Internal Alphan
 -- Notifications with long headlines are overlapping with text

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_group_notify.xml b/indra/newview/skins/default/xui/en/panel_group_notify.xml
index bd98996ae1..ef3120174e 100644
--- a/indra/newview/skins/default/xui/en/panel_group_notify.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_notify.xml
@@ -25,7 +25,7 @@
      name="subject"
      text_color="GroupNotifyTextColor"
      font="SansSerifBig"
-     top="60"
+     top="40"
      use_ellipses="true"
      value="subject"
      width="300"
-- 
cgit v1.2.3


From 02943eca33a2cb5be39025557ca6e7aca30ea93a Mon Sep 17 00:00:00 2001
From: Lis Pardi <lis@lindenlab.com>
Date: Tue, 10 Nov 2009 17:55:24 -0500
Subject: EXT-2356 Replace Log button in bottom tray with up arrow

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
index 7128c20038..a12797d96b 100644
--- a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
@@ -43,11 +43,13 @@
     <button
      follows="right"
      is_toggle="true"
-     width="45"
+     width="20"
      top="0"
      layout="topleft"
-     left_pad="8"
-     label="Log"
+     left_pad="4           "
+     image_disabled="ComboButton_UpOff"
+     image_unselected="ComboButton_UpOff"
+     image_selected="ComboButton_UpSelected"
      height="23"
      name="show_nearby_chat"
      tool_tip="Shows/hides nearby chat log">
-- 
cgit v1.2.3


From 859c9f25655fc6ce79612d739a30e345a0521062 Mon Sep 17 00:00:00 2001
From: Steve Bennetts <steve@lindenlab.com>
Date: Tue, 10 Nov 2009 14:57:41 -0800
Subject: Restore "Show Advanced Permissions"

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 1499095bcc..e98a6d57bb 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -843,18 +843,18 @@
                 <menu_item_call.on_click
                  function="Floater.Toggle"
                  parameter="perm_prefs" />
-         <menu_item_check
-         label="Show Advanced Permissions"
-         layout="topleft"
-         name="DebugPermissions">
-            <menu_item_check.on_check
-             function="CheckControl"
-             parameter="DebugPermissions" />
-            <menu_item_check.on_click
-             function="ToggleControl"
-             parameter="DebugPermissions" />
-        </menu_item_check>
             </menu_item_call>
+			<menu_item_check
+			   label="Show Advanced Permissions"
+			   layout="topleft"
+			   name="DebugPermissions">
+			  <menu_item_check.on_check
+				 function="CheckControl"
+				 parameter="DebugPermissions" />
+			  <menu_item_check.on_click
+				 function="ToggleControl"
+				 parameter="DebugPermissions" />
+			</menu_item_check>
             <!--menu_item_call
              label="Show Script Warning/Error Window"
              layout="topleft"
-- 
cgit v1.2.3


From 26d848e91ec566aad890c8d59afafd8a05567d85 Mon Sep 17 00:00:00 2001
From: Erica <erica@lindenlab.com>
Date: Tue, 10 Nov 2009 15:00:19 -0800
Subject: EXT-2336 add new media art to viewer

---
 .../skins/default/textures/icons/AudioMute_Off.png        | Bin 0 -> 600 bytes
 .../skins/default/textures/icons/AudioMute_Over.png       | Bin 0 -> 587 bytes
 indra/newview/skins/default/textures/icons/Audio_Off.png  | Bin 0 -> 467 bytes
 .../newview/skins/default/textures/icons/Audio_Press.png  | Bin 0 -> 477 bytes
 .../skins/default/textures/icons/ExternalBrowser_Off.png  | Bin 0 -> 279 bytes
 indra/newview/skins/default/textures/icons/Pause_Off.png  | Bin 0 -> 163 bytes
 indra/newview/skins/default/textures/icons/Pause_Over.png | Bin 0 -> 160 bytes
 .../newview/skins/default/textures/icons/Pause_Press.png  | Bin 0 -> 156 bytes
 indra/newview/skins/default/textures/icons/Play_Off.png   | Bin 0 -> 293 bytes
 indra/newview/skins/default/textures/icons/Play_Over.png  | Bin 0 -> 258 bytes
 indra/newview/skins/default/textures/icons/Play_Press.png | Bin 0 -> 287 bytes
 .../skins/default/textures/icons/SkipBackward_Off.png     | Bin 0 -> 293 bytes
 .../skins/default/textures/icons/SkipForward_Off.png      | Bin 0 -> 304 bytes
 .../skins/default/textures/icons/StopReload_Off.png       | Bin 0 -> 533 bytes
 .../skins/default/textures/icons/StopReload_Over.png      | Bin 0 -> 529 bytes
 indra/newview/skins/default/textures/icons/Zoom_Off.png   | Bin 0 -> 435 bytes
 .../skins/default/textures/icons/parcel_color_EVRY.png    | Bin 0 -> 393 bytes
 .../skins/default/textures/icons/parcel_color_EXP.png     | Bin 0 -> 272 bytes
 .../skins/default/textures/icons/parcel_color_M.png       | Bin 0 -> 306 bytes
 indra/newview/skins/default/textures/navbar/Flag.png      | Bin 0 -> 338 bytes
 indra/newview/skins/default/textures/navbar/Lock.png      | Bin 0 -> 302 bytes
 21 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/icons/AudioMute_Off.png
 create mode 100644 indra/newview/skins/default/textures/icons/AudioMute_Over.png
 create mode 100644 indra/newview/skins/default/textures/icons/Audio_Off.png
 create mode 100644 indra/newview/skins/default/textures/icons/Audio_Press.png
 create mode 100644 indra/newview/skins/default/textures/icons/ExternalBrowser_Off.png
 create mode 100644 indra/newview/skins/default/textures/icons/Pause_Off.png
 create mode 100644 indra/newview/skins/default/textures/icons/Pause_Over.png
 create mode 100644 indra/newview/skins/default/textures/icons/Pause_Press.png
 create mode 100644 indra/newview/skins/default/textures/icons/Play_Off.png
 create mode 100644 indra/newview/skins/default/textures/icons/Play_Over.png
 create mode 100644 indra/newview/skins/default/textures/icons/Play_Press.png
 create mode 100644 indra/newview/skins/default/textures/icons/SkipBackward_Off.png
 create mode 100644 indra/newview/skins/default/textures/icons/SkipForward_Off.png
 create mode 100644 indra/newview/skins/default/textures/icons/StopReload_Off.png
 create mode 100644 indra/newview/skins/default/textures/icons/StopReload_Over.png
 create mode 100644 indra/newview/skins/default/textures/icons/Zoom_Off.png
 create mode 100644 indra/newview/skins/default/textures/icons/parcel_color_EVRY.png
 create mode 100644 indra/newview/skins/default/textures/icons/parcel_color_EXP.png
 create mode 100644 indra/newview/skins/default/textures/icons/parcel_color_M.png
 create mode 100644 indra/newview/skins/default/textures/navbar/Flag.png
 create mode 100644 indra/newview/skins/default/textures/navbar/Lock.png

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/icons/AudioMute_Off.png b/indra/newview/skins/default/textures/icons/AudioMute_Off.png
new file mode 100644
index 0000000000..938aaef491
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/AudioMute_Off.png differ
diff --git a/indra/newview/skins/default/textures/icons/AudioMute_Over.png b/indra/newview/skins/default/textures/icons/AudioMute_Over.png
new file mode 100644
index 0000000000..7bd1b12aae
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/AudioMute_Over.png differ
diff --git a/indra/newview/skins/default/textures/icons/Audio_Off.png b/indra/newview/skins/default/textures/icons/Audio_Off.png
new file mode 100644
index 0000000000..ef746aab92
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Audio_Off.png differ
diff --git a/indra/newview/skins/default/textures/icons/Audio_Press.png b/indra/newview/skins/default/textures/icons/Audio_Press.png
new file mode 100644
index 0000000000..25a669224a
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Audio_Press.png differ
diff --git a/indra/newview/skins/default/textures/icons/ExternalBrowser_Off.png b/indra/newview/skins/default/textures/icons/ExternalBrowser_Off.png
new file mode 100644
index 0000000000..69646ce473
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/ExternalBrowser_Off.png differ
diff --git a/indra/newview/skins/default/textures/icons/Pause_Off.png b/indra/newview/skins/default/textures/icons/Pause_Off.png
new file mode 100644
index 0000000000..77f6be569d
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Pause_Off.png differ
diff --git a/indra/newview/skins/default/textures/icons/Pause_Over.png b/indra/newview/skins/default/textures/icons/Pause_Over.png
new file mode 100644
index 0000000000..580808bf7e
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Pause_Over.png differ
diff --git a/indra/newview/skins/default/textures/icons/Pause_Press.png b/indra/newview/skins/default/textures/icons/Pause_Press.png
new file mode 100644
index 0000000000..859db34cae
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Pause_Press.png differ
diff --git a/indra/newview/skins/default/textures/icons/Play_Off.png b/indra/newview/skins/default/textures/icons/Play_Off.png
new file mode 100644
index 0000000000..e594c1a4cb
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Play_Off.png differ
diff --git a/indra/newview/skins/default/textures/icons/Play_Over.png b/indra/newview/skins/default/textures/icons/Play_Over.png
new file mode 100644
index 0000000000..70ab94e8c2
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Play_Over.png differ
diff --git a/indra/newview/skins/default/textures/icons/Play_Press.png b/indra/newview/skins/default/textures/icons/Play_Press.png
new file mode 100644
index 0000000000..b52742c6da
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Play_Press.png differ
diff --git a/indra/newview/skins/default/textures/icons/SkipBackward_Off.png b/indra/newview/skins/default/textures/icons/SkipBackward_Off.png
new file mode 100644
index 0000000000..8fc10e6583
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/SkipBackward_Off.png differ
diff --git a/indra/newview/skins/default/textures/icons/SkipForward_Off.png b/indra/newview/skins/default/textures/icons/SkipForward_Off.png
new file mode 100644
index 0000000000..2892e3cfa9
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/SkipForward_Off.png differ
diff --git a/indra/newview/skins/default/textures/icons/StopReload_Off.png b/indra/newview/skins/default/textures/icons/StopReload_Off.png
new file mode 100644
index 0000000000..698569a540
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/StopReload_Off.png differ
diff --git a/indra/newview/skins/default/textures/icons/StopReload_Over.png b/indra/newview/skins/default/textures/icons/StopReload_Over.png
new file mode 100644
index 0000000000..251b38630a
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/StopReload_Over.png differ
diff --git a/indra/newview/skins/default/textures/icons/Zoom_Off.png b/indra/newview/skins/default/textures/icons/Zoom_Off.png
new file mode 100644
index 0000000000..d096720c9c
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Zoom_Off.png differ
diff --git a/indra/newview/skins/default/textures/icons/parcel_color_EVRY.png b/indra/newview/skins/default/textures/icons/parcel_color_EVRY.png
new file mode 100644
index 0000000000..b5508423eb
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/parcel_color_EVRY.png differ
diff --git a/indra/newview/skins/default/textures/icons/parcel_color_EXP.png b/indra/newview/skins/default/textures/icons/parcel_color_EXP.png
new file mode 100644
index 0000000000..4813d37198
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/parcel_color_EXP.png differ
diff --git a/indra/newview/skins/default/textures/icons/parcel_color_M.png b/indra/newview/skins/default/textures/icons/parcel_color_M.png
new file mode 100644
index 0000000000..41984c43e4
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/parcel_color_M.png differ
diff --git a/indra/newview/skins/default/textures/navbar/Flag.png b/indra/newview/skins/default/textures/navbar/Flag.png
new file mode 100644
index 0000000000..df53c89224
Binary files /dev/null and b/indra/newview/skins/default/textures/navbar/Flag.png differ
diff --git a/indra/newview/skins/default/textures/navbar/Lock.png b/indra/newview/skins/default/textures/navbar/Lock.png
new file mode 100644
index 0000000000..cf569d6ad2
Binary files /dev/null and b/indra/newview/skins/default/textures/navbar/Lock.png differ
-- 
cgit v1.2.3


From 415091d92929b86b6a2a82a7880c8508441bb371 Mon Sep 17 00:00:00 2001
From: Erica <erica@lindenlab.com>
Date: Tue, 10 Nov 2009 15:26:21 -0800
Subject: Added media textures to textures.xml

---
 indra/newview/skins/default/textures/textures.xml | 56 +++++++++++++++++++++++
 1 file changed, 56 insertions(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index fba8e0b06c..48c7236796 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -23,6 +23,14 @@
   <texture name="Arrow_Up" file_name="widgets/Arrow_Up.png" preload="true" />
   <texture name="Arrow_Down" file_name="widgets/Arrow_Down.png" preload="true" />
 
+  <texture name="AudioMute_Off.png" file_name="icons/AudioMute_Off.png" preload="false" />
+  <texture name="AudioMute_Over.png" file_name="icons/AudioMute_Over.png" preload="false" />
+  <texture name="AudioMute_Press.png" file_name="icons/AudioMute_Press.png" preload="false" />
+
+  <texture name="Audio_Off.png" file_name="icons/Audio_Off.png" preload="false" />
+  <texture name="Audio_Over.png" file_name="icons/Audio_Over.png" preload="false" />
+  <texture name="Audio_Press.png" file_name="icons/Audio_Press.png" preload="false" />
+
   <texture name="BackArrow_Disabled" file_name="icons/BackArrow_Disabled.png" preload="false" />
   <texture name="BackArrow_Off" file_name="icons/BackArrow_Off.png" preload="false" />
   <texture name="BackArrow_Press" file_name="icons/BackArrow_Press.png" preload="false" />
@@ -99,6 +107,10 @@
 
   <texture name="DropTarget" file_name="widgets/DropTarget.png" preload="false" />
 
+  <texture name="ExternalBrowser_Off.png" file_name="icons/ExternalBrowser_Off.png" preload="false" />
+  <texture name="ExternalBrowser_Over.png" file_name="icons/ExternalBrowser_Over.png" preload="false" />
+  <texture name="ExternalBrowser_Press.png" file_name="icons/ExternalBrowser_Press.png" preload="false" />
+
   <texture name="Favorite_Star_Active" file_name="navbar/Favorite_Star_Active.png" preload="false" />
   <texture name="Favorite_Star_Off" file_name="navbar/Favorite_Star_Off.png" preload="false" />
   <texture name="Favorite_Star_Press" file_name="navbar/Favorite_Star_Press.png" preload="false" />
@@ -108,6 +120,8 @@
   <texture name="FileMenu_BarSelect" file_name="navbar/FileMenu_BarSelect.png" preload="false" scale.left="2" scale.top="0" scale.right="2" scale.bottom="0" />
   <texture name="FileMenu_BG" file_name="navbar/FileMenu_BG.png" preload="false" />
 
+  <texture name="Flag" file_name="navbar/Flag.png" preload="false" />
+
   <texture name="ForSale_Badge" file_name="icons/ForSale_Badge.png" preload="false" />
   <texture name="ForwardArrow_Off" file_name="icons/ForwardArrow_Off.png" preload="false" />
   <texture name="ForwardArrow_Press" file_name="icons/ForwardArrow_Press.png" preload="false" />
@@ -207,6 +221,7 @@
   <texture name="ListItem_Over" file_name="widgets/ListItem_Over.png" preload="true" />
 
   <texture name="Lock" file_name="icons/Lock.png" preload="false" />
+  <texture name="Lock2" file_name="navbar/Lock.png" preload="false" />
 
   <texture name="Login_Pod" file_name="windows/Login_Pod.png" preload="true" />
 
@@ -277,10 +292,16 @@
   <texture name="Overhead_M" file_name="world/Overhead_M.png" preload="false" />
   <texture name="Overhead_S" file_name="world/Overhead_S.png" preload="false" />
 
+  <texture name="parcel_color_EVRY" file_name="icons/parcel_color_EVRY.png" preload="false" />
+  <texture name="parcel_color_EXP" file_name="icons/parcel_color_EXP.png" preload="false" />
+  <texture name="parcel_color_M" file_name="icons/parcel_color_M.png" preload="false" />
+
   <texture name="parcel_drk_Build" file_name="icons/parcel_drk_Build.png" preload="false" />
  <texture name="parcel_drk_BuildNo" file_name="icons/parcel_drk_BuildNo.png" preload="false" />
  <texture name="parcel_drk_Damage" file_name="icons/parcel_drk_Damage.png" preload="false" />
  <texture name="parcel_drk_DamageNo" file_name="icons/parcel_drk_DamageNo.png" preload="false" />
+  <texture name="parcel_drk_EVRY" file_name="icons/parcel_drk_EVRY.png" preload="false" />
+  <texture name="parcel_drk_EXP" file_name="icons/parcel_drk_EXP.png" preload="false" />
  <texture name="parcel_drk_Fly" file_name="icons/parcel_drk_Fly.png" preload="false" />
  <texture name="parcel_drk_FlyNo" file_name="icons/parcel_drk_FlyNo.png" preload="false" />
  <texture name="parcel_drk_ForSale" file_name="icons/parcel_drk_ForSale.png" preload="false" />
@@ -299,6 +320,8 @@
  <texture name="parcel_lght_BuildNo" file_name="icons/parcel_lght_BuildNo.png" preload="false" />
  <texture name="parcel_lght_Damage" file_name="icons/parcel_lght_Damage.png" preload="false" />
  <texture name="parcel_lght_DamageNo" file_name="icons/parcel_lght_DamageNo.png" preload="false" />
+  <texture name="parcel_lght_EVRY" file_name="icons/parcel_lght_EVRY.png" preload="false" />
+  <texture name="parcel_lght_EXP" file_name="icons/parcel_lght_EXP.png" preload="false" />
  <texture name="parcel_lght_Fly" file_name="icons/parcel_lght_Fly.png" preload="false" />
  <texture name="parcel_lght_FlyNo" file_name="icons/parcel_lght_FlyNo.png" preload="false" />
  <texture name="parcel_lght_ForSale" file_name="icons/parcel_lght_ForSale.png" preload="false" />
@@ -313,6 +336,13 @@
  <texture name="parcel_lght_Voice" file_name="icons/parcel_lght_Voice.png" preload="false" />
  <texture name="parcel_lght_VoiceNo" file_name="icons/parcel_lght_VoiceNo.png" preload="false" />
 
+  <texture name="Pause_Off.png" file_name="icons/Pause_Off.png" preload="false" />
+  <texture name="Pause_Over.png" file_name="icons/Pause_Over.png" preload="false" />
+  <texture name="Pause_Press.png" file_name="icons/Pause_Press.png" preload="false" />
+  <texture name="Play_Off.png" file_name="icons/Play_Off.png" preload="false" />
+  <texture name="Play_Over.png" file_name="icons/Play_Over.png" preload="false" />
+  <texture name="Play_Press.png" file_name="icons/Play_Press.png" preload="false" />
+
   <texture name="Progress_1" file_name="icons/Progress_1.png" preload="false" />
   <texture name="Progress_2" file_name="icons/Progress_2.png" preload="false" />
   <texture name="Progress_3" file_name="icons/Progress_3.png" preload="false" />
@@ -364,6 +394,12 @@
   <texture name="ScrollTrack_Vert" file_name="widgets/ScrollTrack_Vert.png" preload="true" scale.left="2" scale.top="40" scale.bottom="13" scale.right="0" />
   <texture name="ScrollTrack_Horiz" file_name="widgets/ScrollTrack_Horiz.png" preload="true" scale.left="4" scale.top="0" scale.bottom="0" scale.right="2" />
 
+  <texture name="ScrubberThumb_Disabled" file_name="widgets/ScrubberThumb_Disabled.png" preload="false" />
+  <texture name="ScrubberThumb_Focus" file_name="widgets/ScrubberThumb_Focus.png" preload="false" />
+  <texture name="ScrubberThumb_Off" file_name="widgets/ScrubberThumb_Off.png" preload="false" />
+  <texture name="ScrubberThumb_Over" file_name="widgets/ScrubberThumb_Over.png" preload="false" />
+  <texture name="ScrubberThumb_Press" file_name="widgets/ScrubberThumb_Press.png" preload="false" />
+
   <texture name="Search" file_name="navbar/Search.png" preload="false" />
 
   <texture name="SegmentedBtn_Left_Off" file_name="widgets/SegmentedBtn_Left_Off.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
@@ -387,6 +423,13 @@
   <texture name="SegmentedBtn_Right_Selected_Press" file_name="widgets/SegmentedBtn_Right_Selected_Press.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
   <texture name="SegmentedBtn_Right_Selected_Disabled" file_name="widgets/SegmentedBtn_Right_Selected_Disabled.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
 
+  <texture name="SkipBackward_Off.png" file_name="icons/SkipBackward_Off.png" preload="false" />
+  <texture name="SkipBackward_Over.png" file_name="icons/SkipBackward_Over.png" preload="false" />
+  <texture name="SkipBackward_Press.png" file_name="icons/SkipBackward_Press.png" preload="false" />
+  <texture name="SkipForward_Off.png" file_name="icons/SkipForward_Off.png" preload="false" />
+  <texture name="SkipForward_Over.png" file_name="icons/SkipForward_Over.png" preload="false" />
+  <texture name="SkipForward_Press.png" file_name="icons/SkipForward_Press.png" preload="false" />
+
   <texture name="SliderTrack_Horiz" file_name="widgets/SliderTrack_Horiz.png" scale.left="4" scale.top="4" scale.right="100" scale.bottom="2" />
   <texture name="SliderTrack_Vert" file_name="widgets/SliderTrack_Vert.png" scale.left="2" scale.top="100" scale.right="4" scale.bottom="4" />
   <texture name="SliderThumb_Off" file_name="widgets/SliderThumb_Off.png" />
@@ -404,6 +447,10 @@
   <texture name="Stepper_Up_Off" file_name="widgets/Stepper_Up_Off.png" preload="true" />
   <texture name="Stepper_Up_Press" file_name="widgets/Stepper_Up_Press.png" preload="true" />
 
+  <texture name="StopReload_Off.png" file_name="icons/StopReload_Off.png" preload="false" />
+  <texture name="StopReload_Over.png" file_name="icons/StopReload_Over.png" preload="false" />
+  <texture name="StopReload_Press.png" file_name="icons/StopReload_Press.png" preload="false" />
+
   <texture name="TabIcon_Appearance_Large" file_name="taskpanel/TabIcon_Appearance_Large.png" preload="false" />
   <texture name="TabIcon_Appearance_Off" file_name="taskpanel/TabIcon_Appearance_Off.png" preload="false" />
   <texture name="TabIcon_Appearance_Over" file_name="taskpanel/TabIcon_Appearance_Over.png" preload="false" />
@@ -459,6 +506,9 @@
   <texture name="TextField_Disabled" file_name="widgets/TextField_Disabled.png" preload="true" scale.left="9" scale.top="12" scale.right="248" scale.bottom="12" />
   <texture name="TextField_Active" file_name="widgets/TextField_Active.png" preload="true" scale.left="9" scale.top="12" scale.right="248" scale.bottom="12" />
 
+  <texture name="TimeBasedMediaBackground" file_name="windows/TimeBasedMediaBackground.png" preload="false" />
+
+
   <texture name="Toast_CloseBtn" file_name="windows/Toast_CloseBtn.png" preload="true" />
   <texture name="Toast_Background" file_name="windows/Toast_Background.png" preload="true"
            scale.left="4" scale.top="28" scale.right="60" scale.bottom="4" />
@@ -493,6 +543,8 @@
   <texture name="VoicePTT_Off" file_name="bottomtray/VoicePTT_Off.png" preload="false" />
   <texture name="VoicePTT_On" file_name="bottomtray/VoicePTT_On.png" preload="false" />
 
+  <texture name="WebBasedMediaBackground" file_name="windows/WebBasedMediaBackground.png" preload="false" />
+
   <texture name="Widget_DownArrow" file_name="icons/Widget_DownArrow.png" preload="true" />
   <texture name="Widget_UpArrow" file_name="icons/Widget_UpArrow.png" preload="true" />
 
@@ -507,6 +559,10 @@
 
   <texture name="YouAreHere_Badge" file_name="icons/YouAreHere_Badge.png" preload="false" />
 
+  <texture name="Zoom_Off.png" file_name="icons/Zoom_Off.png" preload="false" />
+  <texture name="Zoom_Over.png" file_name="icons/Zoom_Over.png" preload="false" />
+  <texture name="Zoom_Press.png" file_name="icons/Zoom_Press.png" preload="false" />
+
   <!--WARNING OLD ART *do not use*-->
 
   <texture name="btn_chatbar.tga" scale.left="20" scale.top="24" scale.right="44" scale.bottom="0" />
-- 
cgit v1.2.3


From 43f13cedf3608271d013ac14d722a41b3d0c69cb Mon Sep 17 00:00:00 2001
From: Lis Pardi <lis@lindenlab.com>
Date: Tue, 10 Nov 2009 18:30:17 -0500
Subject: EXT-2355 Preferences: Inconsistent use of capital letters for second
 word of labels

---
 indra/newview/skins/default/xui/en/panel_preferences_advanced.xml | 2 +-
 indra/newview/skins/default/xui/en/panel_preferences_general.xml  | 2 +-
 indra/newview/skins/default/xui/en/panel_preferences_privacy.xml  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
index 06f0710406..0ac0521b10 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -284,7 +284,7 @@ Avatars:
      enabled_control="EnableVoiceChat"
      control_name="PushToTalkToggle"
      height="20"
-     label="Toggle mode for microphone when I press the Speak trigger key:"
+     label="Toggle mode for microphone when I press the speak trigger key:"
      layout="topleft"
      left="30"
      name="push_to_talk_toggle_check"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
index 975d21aaa6..a6ca73d4b7 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -305,7 +305,7 @@
      name="effects_color_textbox"
      top_pad="5"
      width="400">
-        My Effects:
+        My effects:
     </text>
     <color_swatch
      border_color="0.45098 0.517647 0.607843 1"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
index acf4601bfe..8c22a5e483 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
@@ -208,7 +208,7 @@
     <button
      follows="left|bottom"
      height="20"
-     label="Block List"
+     label="Block list"
      layout="topleft"
      left="30"
      name="block_list"
-- 
cgit v1.2.3


From a3017978d3b4134c2408eb4e3124d8725a9f4733 Mon Sep 17 00:00:00 2001
From: Lynx Linden <lynx@lindenlab.com>
Date: Wed, 11 Nov 2009 00:25:33 +0000
Subject: DEV-41358: Added user's preferred maturity level to search URL.

The Search URL now includes a "r=" query parameter to specify the
user's preferred maturity rating. This can be "pg" or "pg,mature"
or "pg,mature,adult".
---
 indra/newview/skins/default/xui/en/floater_search.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_search.xml b/indra/newview/skins/default/xui/en/floater_search.xml
index edc1fb8838..b9cf456842 100644
--- a/indra/newview/skins/default/xui/en/floater_search.xml
+++ b/indra/newview/skins/default/xui/en/floater_search.xml
@@ -2,7 +2,7 @@
 <floater
  legacy_header_height="18"
  can_resize="true"
- height="400"
+ height="512"
  layout="topleft"
  min_height="140"
  min_width="467"
-- 
cgit v1.2.3


From d181b84dfdce83d1999d086c3eda2cdc51849a11 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Tue, 10 Nov 2009 17:10:47 -0800
Subject: EXT-1478   	 Tool-tip background and border colors are being
 ignored EXT-2082   	 Multifloater preview tab container extends outside
 window border EXT-773   	 odd notecard behaviour on closing an unsaved
 notcard reviewed by Richard

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/widgets/inspector.xml b/indra/newview/skins/default/xui/en/widgets/inspector.xml
new file mode 100644
index 0000000000..61950d7554
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/inspector.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!-- See also settings.xml UIFloater* settings for configuration -->
+<inspector name="inspector"
+          bg_opaque_color="ToolTipBgColor"
+          background_visible="true"
+          bg_opaque_image="none"
+          bg_alpha_image="none"
+ />
-- 
cgit v1.2.3


From e2a0e9426f3ce81cf65e576a4e8bc787483bb26a Mon Sep 17 00:00:00 2001
From: Erica <erica@lindenlab.com>
Date: Tue, 10 Nov 2009 17:17:26 -0800
Subject: pushing changes to named font sizes prior to hardcoded font removal

---
 .../skins/default/xui/en/floater_test_textbox.xml  | 92 ++++++----------------
 indra/newview/skins/default/xui/en/fonts.xml       |  8 +-
 2 files changed, 28 insertions(+), 72 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_test_textbox.xml b/indra/newview/skins/default/xui/en/floater_test_textbox.xml
index 8dba05f1ee..3aeb7c93e7 100644
--- a/indra/newview/skins/default/xui/en/floater_test_textbox.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_textbox.xml
@@ -10,83 +10,64 @@
     <text
      type="string"
      length="1"
-     height="10"
-     layout="topleft"
-     left="10"
-     top="30"
-     width="300">
-        Bottom and left specified
-    </text>
-    <text
-     type="string"
-     length="1"
-     height="10"
-     layout="topleft"
-     left_delta="200"
-     top_delta="0"
-     width="300">
-        Bottom delta left delta
-    </text>
-    <text
-     type="string"
-     length="1"
-     height="10"
+     height="90"
      layout="topleft"
      left="10"
-     top="50"
-     width="300">
-        Bottom delta -20
-    </text>
-    <text
-     type="string"
-     length="1"
-     height="10"
-     layout="topleft"
-     left_delta="0"
      top_pad="30"
      width="300">
         First line of multiple lines
-    Second line of multiple lines
+Second line of multiple lines
+Third line of multiple lines
+Fourth line of multiple lines
+Fifth line of multiple lines
     </text>
       <text
        top_pad="10"
        left="10"
-       right="-10" 
+       right="-10"
+       height="20"
        follows="top|left"
        font.name="SansSerifSmall"
        name="test_text10"
        tool_tip="text">
-        SansSerifSmall. Русский 中文 (简体) The quick brown fox jumped over the lazy dog.
+        SansSerifSmall
+The 华文细黑 brown fox ヒラキjumped over the lazy dog.
       </text>
       <text
        top_pad="10"
        left="10"
-       right="-10" 
+       right="-10"
+       height="25"
        follows="top|left"
-       font.name="SansSerif"
+       font.name="SansSerifMedium"
        name="test_text11"
        tool_tip="text">
-        SansSerif.  Русский 中文 (简体) The quick brown fox jumped over the lazy dog.
+        SansSerif
+The 华文细黑 brown fox ヒラキjumped over the lazy dog.
       </text>
       <text
        top_pad="10"
        left="10"
-       right="-10" 
+       right="-10"
        follows="top|left"
+       height="26"
        font.name="SansSerifLarge"
        name="test_text12"
        tool_tip="text">
-        SansSerifLarge.  Русский 中文 (简体) The quick brown fox jumped over the lazy dog.
+        SansSerifLarge
+The 华文细黑 brown fox ヒラキjumped over the lazy dog.
       </text>
       <text
        top_pad="10"
        left="10"
-       right="-10" 
+       height="35"
+       right="-10"
        follows="top|left"
        font.name="SansSerifHuge"
        name="test_text13"
        tool_tip="text">
-        SansSerifHuge.  Русский 中文 (简体) The quick brown fox jumped over the lazy dog.
+        SansSerifHuge
+The 华文细黑 brown fox ヒラキjumped over the lazy dog.
       </text>
     <text
      type="string"
@@ -112,27 +93,6 @@
      width="300">
       SansSerif BOLD UNDERLINE
     </text>
-    <text
-     type="string"
-     length="1"
-     font="SansSerif"
-     height="10"
-     layout="topleft"
-     left_delta="0"
-     top_pad="10"
-     width="300">
-      SansSerif UNDERLINE
-    </text>
-    <text
-     type="string"
-     length="1"
-     height="10"
-     layout="topleft"
-     left_delta="0"
-     top_pad="10"
-     width="300">
-        Escaped greater than &gt;
-    </text>
     <text
    type="string"
    length="1"
@@ -142,8 +102,7 @@
    left="10"
    name="right_aligned_text"
    width="380"
-   halign="right" 
-   text_color="1 1 1 0.7"
+   halign="right"
    top_pad="10">
     Right aligned text
   </text>
@@ -157,21 +116,19 @@
  name="centered_text"
  width="380"
  halign="center"
- text_color="1 1 1 0.7"
  top_pad="10">
     Centered text
   </text>
   <text
  type="string"
  length="1"
- height="60" 
+ height="60"
  label="N"
  layout="topleft"
  left="10"
  name="left_aligned_text"
  width="380"
  halign="left"
- text_color="1 1 1 0.7"
  top_pad="10">
     Left aligned text
   </text>
@@ -184,7 +141,6 @@
    left="10"
    name="floater_map_north"
    right="30"
-   text_color="1 1 1 0.7"
    top="370">
     N
   </text>
diff --git a/indra/newview/skins/default/xui/en/fonts.xml b/indra/newview/skins/default/xui/en/fonts.xml
index f3da62a896..ebbb53729d 100644
--- a/indra/newview/skins/default/xui/en/fonts.xml
+++ b/indra/newview/skins/default/xui/en/fonts.xml
@@ -144,18 +144,18 @@
 	     />
   <font_size name="Huge"
 	     comment="Size of huge font (points, or 1/72 of an inch)"
-	     size="15.0"
+	     size="16.0"
 	     />
   <font_size name="Large"
 	     comment="Size of large font (points, or 1/72 of an inch)"
-	     size="10.0"
+	     size="10.6"
 	     />
   <font_size name="Medium"
 	     comment="Size of medium font (points, or 1/72 of an inch)"
-	     size="9.0"
+	     size="8.6"
 	     />
   <font_size name="Small"
 	     comment="Size of small font (points, or 1/72 of an inch)"
-	     size="7.8"
+	     size="7.6"
 	     />
 </fonts>
-- 
cgit v1.2.3