From 6b203f2ee4bbaf893b7256e35581403b18de68f3 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 19 Mar 2020 21:39:05 +0200
Subject: SL-12607 FMOD Logo

---
 .../skins/default/xui/en/panel_progress.xml        | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/panel_progress.xml b/indra/newview/skins/default/xui/en/panel_progress.xml
index 860caf2d21..03caf8e8ad 100644
--- a/indra/newview/skins/default/xui/en/panel_progress.xml
+++ b/indra/newview/skins/default/xui/en/panel_progress.xml
@@ -106,6 +106,28 @@
                      top="145"
                      right="-90"
                      word_wrap="true"/>
+                    <icon
+                     height="24"
+                     width="91"
+                     left="48"
+                     top="190"
+                     name="fmod_logo"
+                     visible ="false"
+                      />
+                    <text
+                     follows="left|right|top|bottom"
+                     layout="topleft"
+                     font_shadow="none"
+                     halign="left"
+                     height="16"
+                     width="400"
+                     top_delta="10"
+                     left_pad="4"
+                     line_spacing.pixels="2"
+                     name="fmod_text"
+                     text_color="LoginProgressBoxTextColor">
+                      Made with FMOD Studio by Firelight Technologies Pty Ltd.
+                    </text>
                 </layout_panel>
                 <layout_panel
                  height="200"
-- 
cgit v1.2.3


From 347c53855bb0c983e0300594772a9206f9031065 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 13 Apr 2020 22:41:55 +0300
Subject: SL-12607 Added more icons and draw methods to draw them

---
 .../newview/skins/default/xui/en/panel_progress.xml | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_progress.xml b/indra/newview/skins/default/xui/en/panel_progress.xml
index 03caf8e8ad..f52422c08f 100644
--- a/indra/newview/skins/default/xui/en/panel_progress.xml
+++ b/indra/newview/skins/default/xui/en/panel_progress.xml
@@ -106,27 +106,20 @@
                      top="145"
                      right="-90"
                      word_wrap="true"/>
-                    <icon
-                     height="24"
-                     width="91"
-                     left="48"
-                     top="190"
-                     name="fmod_logo"
-                     visible ="false"
-                      />
+                    <!--Logos are tied to following label from code-->
                     <text
-                     follows="left|right|top|bottom"
+                     follows="left|right|top"
                      layout="topleft"
                      font_shadow="none"
                      halign="left"
                      height="16"
-                     width="400"
-                     top_delta="10"
-                     left_pad="4"
+                     width="100"
+                     left="48"
+                     top="200"
                      line_spacing.pixels="2"
-                     name="fmod_text"
+                     name="logos_lbl"
                      text_color="LoginProgressBoxTextColor">
-                      Made with FMOD Studio by Firelight Technologies Pty Ltd.
+                      Second Life uses
                     </text>
                 </layout_panel>
                 <layout_panel
-- 
cgit v1.2.3


From 032c4a1b4999b117f53465e62bf932e62015a7fe Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 14 Apr 2020 21:32:10 +0300
Subject: SL-12607 WIP, take pre-sized icons from repo instead of package

---
 .../skins/default/textures/3p_icons/fmod_logo.png        | Bin 0 -> 1732 bytes
 .../skins/default/textures/3p_icons/havok_logo.png       | Bin 0 -> 2586 bytes
 .../skins/default/textures/3p_icons/vivox_logo.png       | Bin 0 -> 1740 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/3p_icons/fmod_logo.png
 create mode 100644 indra/newview/skins/default/textures/3p_icons/havok_logo.png
 create mode 100644 indra/newview/skins/default/textures/3p_icons/vivox_logo.png

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

diff --git a/indra/newview/skins/default/textures/3p_icons/fmod_logo.png b/indra/newview/skins/default/textures/3p_icons/fmod_logo.png
new file mode 100644
index 0000000000..5da146bfa9
Binary files /dev/null and b/indra/newview/skins/default/textures/3p_icons/fmod_logo.png differ
diff --git a/indra/newview/skins/default/textures/3p_icons/havok_logo.png b/indra/newview/skins/default/textures/3p_icons/havok_logo.png
new file mode 100644
index 0000000000..1b51e23ca0
Binary files /dev/null and b/indra/newview/skins/default/textures/3p_icons/havok_logo.png differ
diff --git a/indra/newview/skins/default/textures/3p_icons/vivox_logo.png b/indra/newview/skins/default/textures/3p_icons/vivox_logo.png
new file mode 100644
index 0000000000..6bbd050eae
Binary files /dev/null and b/indra/newview/skins/default/textures/3p_icons/vivox_logo.png differ
-- 
cgit v1.2.3


From c49e9baa487610eb16717d6c6b01ed1d1c0426d3 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 15 Apr 2020 22:52:28 +0300
Subject: SL-12607 Rearrange login panel

---
 indra/newview/skins/default/textures/textures.xml  |   1 +
 .../default/textures/widgets/ProgressBarSolid.png  | Bin 0 -> 208 bytes
 .../skins/default/xui/en/panel_progress.xml        | 198 ++++++++++++++-------
 3 files changed, 138 insertions(+), 61 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/widgets/ProgressBarSolid.png

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

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 17340e0858..d4645cc459 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -486,6 +486,7 @@ with the same filename but different name
   <texture name="Play_Press" file_name="icons/Play_Press.png" preload="false" />
   
   <texture name="ProgressBar" file_name="widgets/ProgressBar.png" preload="true" scale.left="4" scale.top="11" scale.right="48" scale.bottom="3" />
+  <texture name="ProgressBarSolid" file_name="widgets/ProgressBarSolid.png" preload="true" scale.left="4" scale.top="11" scale.right="48" scale.bottom="3" />
   <texture name="ProgressTrack" file_name="widgets/ProgressTrack.png" preload="true" scale.left="4" scale.top="13" scale.right="148" scale.bottom="2" />
 
   <texture name="PushButton_Disabled" file_name="widgets/PushButton_Disabled.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
diff --git a/indra/newview/skins/default/textures/widgets/ProgressBarSolid.png b/indra/newview/skins/default/textures/widgets/ProgressBarSolid.png
new file mode 100644
index 0000000000..ec0926bfa1
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/ProgressBarSolid.png differ
diff --git a/indra/newview/skins/default/xui/en/panel_progress.xml b/indra/newview/skins/default/xui/en/panel_progress.xml
index f52422c08f..1384e5e779 100644
--- a/indra/newview/skins/default/xui/en/panel_progress.xml
+++ b/indra/newview/skins/default/xui/en/panel_progress.xml
@@ -58,69 +58,145 @@
                      left="0"
                      top="0"
                      width="670" />
-                    <text
-                     follows="left|right|top"
-                     font="SansSerifHuge"
-                     font_shadow="none"
-                     halign="left"
-                     height="20"
-                     layout="topleft"
-                     left_delta="47"
-                     name="title_text"
-                     text_color="LoginProgressBoxTextColor"
-                     top_delta="50"
-                     right="-47"/>
-                    <text
-                     follows="left|right|top"
-                     font="SansSerif"
-                     font_shadow="none"
-                     halign="left"
-                     height="20"
-                     layout="topleft"
-                     left_delta="0"
-                     name="progress_text"
-                     text_color="LoginProgressBoxTextColor"
-                     top_pad="5"
-                     right="-47"
-                     word_wrap="true"/>
-                    <progress_bar
-                     bottom="115"
-                     color_bar="1 1 1 0.96"
-                     follows="left|right|top"
-                     height="16"
-                     layout="topleft"
-                     left="45"
-                     name="login_progress_bar"
-                     right="-45" />
-                    <text
+                    <layout_stack
                      follows="left|right|top|bottom"
-                     font="SansSerifLarge"
-                     font_shadow="none"
-                     halign="left"
-                     height="100"
-                     layout="topleft"
-                     left="45"
-                     line_spacing.pixels="2"
-                     name="message_text"
-                     text_color="LoginProgressBoxTextColor"
-                     top="145"
-                     right="-90"
-                     word_wrap="true"/>
-                    <!--Logos are tied to following label from code-->
-                    <text
-                     follows="left|right|top"
+                     height="250"
                      layout="topleft"
-                     font_shadow="none"
-                     halign="left"
-                     height="16"
-                     width="100"
-                     left="48"
-                     top="200"
-                     line_spacing.pixels="2"
-                     name="logos_lbl"
-                     text_color="LoginProgressBoxTextColor">
-                      Second Life uses
-                    </text>
+                     left="0"
+                     orientation="vertical"
+                     name="vertical_centering"
+                     animate="false"
+                     top="0"
+                     width="670">
+                      <layout_panel
+                       auto_resize="false"
+                       height="60"
+                       layout="topleft"
+                       min_height="60"
+                       name="panel_login"
+                       width="670">
+                        <text
+                         follows="left|right|top"
+                         layout="topleft"
+                         font="SansSerifHuge"
+                         font_shadow="none"
+                         halign="left"
+                         height="20"
+                         left="47"
+                         top="32"
+                         right="-47"
+                         name="login_text"
+                         text_color="LoginProgressBoxTextColor">
+                          Logging in...
+                        </text>
+                      </layout_panel>
+                      <layout_panel
+                       auto_resize="false"
+                       height="100"
+                       layout="topleft"
+                       min_height="100"
+                       name="panel_teleport"
+                       width="670">
+                        <text
+                         follows="left|right|top"
+                         layout="topleft"
+                         font="SansSerifHuge"
+                         font_shadow="none"
+                         halign="left"
+                         height="20"
+                         left="47"
+                         top="50"
+                         right="-47"
+                         name="title_text"
+                         text_color="LoginProgressBoxTextColor"/>
+                        <text
+                         follows="left|right|top"
+                         layout="topleft"
+                         font="SansSerif"
+                         font_shadow="none"
+                         halign="left"
+                         height="20"
+                         top_pad="5"
+                         right="-47"
+                         left_delta="0"
+                         name="progress_text"
+                         text_color="LoginProgressBoxTextColor"
+                         word_wrap="true"/>
+                      </layout_panel>
+                      <layout_panel
+                       auto_resize="false"
+                       height="19"
+                       layout="topleft"
+                       min_height="19"
+                       name="panel_progress"
+                       width="670">
+                        <progress_bar
+                         color_bar="1 0.314 0 0.96"
+                         follows="left|right|top"
+                         layout="topleft"
+                         image_fill="ProgressBarSolid"
+                         height="16"
+                         left="45"
+                         top="2"
+                         name="login_progress_bar"
+                         right="-45" />
+                      </layout_panel>
+                      <layout_panel
+                       auto_resize="false"
+                       height="12"
+                       layout="topleft"
+                       min_height="12"
+                       name="panel_spacer"
+                       width="670">
+                      </layout_panel>
+                      <layout_panel
+                       auto_resize="false"
+                       height="110"
+                       layout="topleft"
+                       min_height="110"
+                       name="panel_motd"
+                       width="670">
+                        <text
+                         follows="left|right|top|bottom"
+                         font="SansSerifLarge"
+                         font_shadow="none"
+                         halign="left"
+                         valign="center"
+                         height="100"
+                         layout="topleft"
+                         left="45"
+                         line_spacing.pixels="2"
+                         name="message_text"
+                         text_color="LoginProgressBoxTextColor"
+                         top="7"
+                         right="-90"
+                         word_wrap="true"/>
+                      </layout_panel>
+                      <layout_panel
+                       auto_resize="false"
+                       height="40"
+                       layout="topleft"
+                       min_height="40"
+                       name="panel_icons"
+                       width="670">
+                        <!--Logos are tied to following label from code-->
+                        <text
+                         follows="left|right|top"
+                         layout="topleft"
+                         font="SansSerifLarge"
+                         font_shadow="none"
+                         halign="left"
+                         height="16"
+                         width="240"
+                         left="47"
+                         top="6"
+                         line_spacing.pixels="2"
+                         name="logos_lbl"
+                         text_color="LoginProgressBoxTextColor">
+                          Second Life uses
+                        </text>
+                      </layout_panel>
+                    </layout_stack>
                 </layout_panel>
                 <layout_panel
                  height="200"
-- 
cgit v1.2.3


From de17c53ae32fef76827201ed24a5af137af12313 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 16 Apr 2020 17:34:29 +0300
Subject: SL-12607 Removed spacer

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_progress.xml b/indra/newview/skins/default/xui/en/panel_progress.xml
index 1384e5e779..a0dfff3bd4 100644
--- a/indra/newview/skins/default/xui/en/panel_progress.xml
+++ b/indra/newview/skins/default/xui/en/panel_progress.xml
@@ -141,14 +141,6 @@
                          name="login_progress_bar"
                          right="-45" />
                       </layout_panel>
-                      <layout_panel
-                       auto_resize="false"
-                       height="12"
-                       layout="topleft"
-                       min_height="12"
-                       name="panel_spacer"
-                       width="670">
-                      </layout_panel>
                       <layout_panel
                        auto_resize="false"
                        height="110"
-- 
cgit v1.2.3


From c47516c4421dc3736cf0dbe70a5eba02c90d9a8e Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 28 May 2020 10:09:17 +0300
Subject: SL-12607  Reverted to original logos

---
 .../skins/default/textures/3p_icons/fmod_logo.png    | Bin 1732 -> 14486 bytes
 .../skins/default/textures/3p_icons/havok_logo.png   | Bin 2586 -> 41488 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

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

diff --git a/indra/newview/skins/default/textures/3p_icons/fmod_logo.png b/indra/newview/skins/default/textures/3p_icons/fmod_logo.png
index 5da146bfa9..5a50e0ad34 100644
Binary files a/indra/newview/skins/default/textures/3p_icons/fmod_logo.png and b/indra/newview/skins/default/textures/3p_icons/fmod_logo.png differ
diff --git a/indra/newview/skins/default/textures/3p_icons/havok_logo.png b/indra/newview/skins/default/textures/3p_icons/havok_logo.png
index 1b51e23ca0..ff1ea3a72e 100644
Binary files a/indra/newview/skins/default/textures/3p_icons/havok_logo.png and b/indra/newview/skins/default/textures/3p_icons/havok_logo.png differ
-- 
cgit v1.2.3


From 2e238f0ba85f290582cf900a9e2f76eeb8528280 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 28 May 2020 17:17:54 +0300
Subject: SL-12665 Readjusted all logos

---
 .../skins/default/textures/3p_icons/vivox_logo.png    | Bin 1740 -> 2331 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

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

diff --git a/indra/newview/skins/default/textures/3p_icons/vivox_logo.png b/indra/newview/skins/default/textures/3p_icons/vivox_logo.png
index 6bbd050eae..6f20e87b7a 100644
Binary files a/indra/newview/skins/default/textures/3p_icons/vivox_logo.png and b/indra/newview/skins/default/textures/3p_icons/vivox_logo.png differ
-- 
cgit v1.2.3


From 1fe92a9df951d37ec1373beef39dbb1bb8ae28c4 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 28 May 2020 18:22:17 +0300
Subject: SL-13340 Restored status display for login

---
 .../skins/default/xui/en/panel_progress.xml        | 42 ++++++----------------
 1 file changed, 10 insertions(+), 32 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_progress.xml b/indra/newview/skins/default/xui/en/panel_progress.xml
index a0dfff3bd4..cb7e572aff 100644
--- a/indra/newview/skins/default/xui/en/panel_progress.xml
+++ b/indra/newview/skins/default/xui/en/panel_progress.xml
@@ -44,15 +44,15 @@
                  width="670" />
                 <layout_panel
                  auto_resize="false"
-                 height="250"
+                 height="275"
                  layout="topleft"
-                 min_height="250"
+                 min_height="275"
                  name="panel4"
                  width="670">
                     <icon
                      color="LoginProgressBoxCenterColor"
                      follows="left|right|bottom|top"
-                     height="250"
+                     height="275"
                      image_name="Rounded_Square"
                      layout="topleft"
                      left="0"
@@ -60,7 +60,7 @@
                      width="670" />
                     <layout_stack
                      follows="left|right|top|bottom"
-                     height="250"
+                     height="275"
                      layout="topleft"
                      left="0"
                      orientation="vertical"
@@ -70,32 +70,18 @@
                      width="670">
                       <layout_panel
                        auto_resize="false"
-                       height="60"
+                       height="30"
                        layout="topleft"
-                       min_height="60"
-                       name="panel_login"
+                       min_height="30"
+                       name="panel_top_spacer"
                        width="670">
-                        <text
-                         follows="left|right|top"
-                         layout="topleft"
-                         font="SansSerifHuge"
-                         font_shadow="none"
-                         halign="left"
-                         height="20"
-                         left="47"
-                         top="32"
-                         right="-47"
-                         name="login_text"
-                         text_color="LoginProgressBoxTextColor">
-                          Logging in...
-                        </text>
                       </layout_panel>
                       <layout_panel
                        auto_resize="false"
                        height="100"
                        layout="topleft"
                        min_height="100"
-                       name="panel_teleport"
+                       name="panel_login"
                        width="670">
                         <text
                          follows="left|right|top"
@@ -105,7 +91,7 @@
                          halign="left"
                          height="20"
                          left="47"
-                         top="50"
+                         top="32"
                          right="-47"
                          name="title_text"
                          text_color="LoginProgressBoxTextColor"/>
@@ -122,14 +108,6 @@
                          name="progress_text"
                          text_color="LoginProgressBoxTextColor"
                          word_wrap="true"/>
-                      </layout_panel>
-                      <layout_panel
-                       auto_resize="false"
-                       height="19"
-                       layout="topleft"
-                       min_height="19"
-                       name="panel_progress"
-                       width="670">
                         <progress_bar
                          color_bar="1 0.314 0 0.96"
                          follows="left|right|top"
@@ -137,7 +115,7 @@
                          image_fill="ProgressBarSolid"
                          height="16"
                          left="45"
-                         top="2"
+                         top_pad="5"
                          name="login_progress_bar"
                          right="-45" />
                       </layout_panel>
-- 
cgit v1.2.3


From 952ec4bcdafd952170b7bbffc6985d61cf4966a7 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 28 May 2020 20:50:11 +0300
Subject: SL-12607 Bar color to blue

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_progress.xml b/indra/newview/skins/default/xui/en/panel_progress.xml
index cb7e572aff..e77d097d5f 100644
--- a/indra/newview/skins/default/xui/en/panel_progress.xml
+++ b/indra/newview/skins/default/xui/en/panel_progress.xml
@@ -109,7 +109,7 @@
                          text_color="LoginProgressBoxTextColor"
                          word_wrap="true"/>
                         <progress_bar
-                         color_bar="1 0.314 0 0.96"
+                         color_bar="0 0.67 0.9 0.96"
                          follows="left|right|top"
                          layout="topleft"
                          image_fill="ProgressBarSolid"
-- 
cgit v1.2.3


From 4c710e2878c085e83868709a6075c465f0175088 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 27 May 2020 21:15:15 +0300
Subject: SL-13329 Misalligned checkboxes in inventory filters

---
 .../skins/default/xui/en/floater_inventory_view_finder.xml        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
index a8342e723b..d783d1e23c 100644
--- a/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
@@ -2,7 +2,7 @@
 <floater
  legacy_header_height="18"
  can_minimize="false"
- height="488"
+ height="466"
  layout="topleft"
  name="Inventory Finder"
  help_topic="inventory_finder"
@@ -202,7 +202,7 @@
      left="8"
      mouse_opaque="true"
      name="icon_settings"
-     top="262"
+     top="242"
      width="16" />
     <check_box
      height="16"
@@ -220,7 +220,7 @@
      layout="topleft"
      left="8"
      name="All"
-     top="282"
+     top="262"
      width="100" />
     <button
      height="20"
@@ -368,6 +368,6 @@
      layout="topleft"
      name="Close"
      right="-6"
-     top="454"
+     top="434"
      width="76" />
 </floater>
-- 
cgit v1.2.3