FIRE-33604 - Buy floater and other UI Updates from Scentual Lust

2024-05-07 17:26:13 +01:00 · 2024-05-07 17:26:13 +01:00 · b5a8f0b331
parent 33d1aebb60
commit b5a8f0b331
26 changed files with 21 additions and 13 deletions
--- a/indra/newview/skins/default/xui/en/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_contents.xml
@ -5,7 +5,7 @@
 height="290"
 layout="topleft"
 min_height="150"
- min_width="200"
+ min_width="224"
 name="floater_buy_contents"
 help_topic="floater_buy_contents"
 save_rect="true"
--- a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/TabTop_Middle_Off.png
+++ b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/TabTop_Middle_Off.png
--- a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/TabTop_Middle_Over.png
+++ b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/TabTop_Middle_Over.png
--- a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/TabTop_Middle_Press.png
+++ b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/TabTop_Middle_Press.png
--- a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/TabTop_Middle_Selected.png
+++ b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/TabTop_Middle_Selected.png
--- a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Left_Flash.png
+++ b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Left_Flash.png
--- a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Left_IM_Unselected.png
+++ b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Left_IM_Unselected.png
--- a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Left_Off.png
+++ b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Left_Off.png
--- a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Left_Over.png
+++ b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Left_Over.png
--- a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Left_Press.png
+++ b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Left_Press.png
--- a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Left_Selected.png
+++ b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Left_Selected.png
--- a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Middle_Flash.png
+++ b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Middle_Flash.png
--- a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Middle_IM_Unselected.png
+++ b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Middle_IM_Unselected.png
--- a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Middle_Off.png
+++ b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Middle_Off.png
--- a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Middle_Over.png
+++ b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Middle_Over.png
--- a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Middle_Press.png
+++ b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Middle_Press.png
--- a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Middle_Selected.png
+++ b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Middle_Selected.png
--- a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Right_Off.png
+++ b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Right_Off.png
--- a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Right_Press.png
+++ b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/Toolbar_Right_Press.png
--- a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/tabtop_Left_Over.png
+++ b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/tabtop_Left_Over.png
--- a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/tabtop_Left_Press.png
+++ b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/tabtop_Left_Press.png
--- a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/tabtop_left_off.png
+++ b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/tabtop_left_off.png
--- a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/tabtop_left_selected.png
+++ b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/containers/tabtop_left_selected.png
--- a/indra/newview/skins/starlight/xui/en/floater_tools.xml
+++ b/indra/newview/skins/starlight/xui/en/floater_tools.xml
@ -2947,7 +2947,7 @@ Low ↔ Lwst
             height="50"
             layout="topleft"
             left_pad="10"
-             top_pad="-17"
+             top_pad="-21"
             name="colorswatch"
             tool_tip="Click to open color picker"
             width="40" />
@ -2973,7 +2973,7 @@ Low ↔ Lwst
             layout="topleft"
             left="10"
             name="Light Intensity"
-             top_pad="3"
+             top_pad="-21"
             width="128" />
          <spinner bottom_delta="0"
                   decimal_digits="3"
--- a/indra/newview/skins/starlight/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/starlight/xui/en/panel_main_inventory.xml
@ -437,6 +437,23 @@
       left_pad="0"
       right="-33"
       layout="topleft"
+       name="dummy_panel">
+          <icon
+           follows="top|left|right"
+           height="25"
+           image_name="Toolbar_Middle_Off"
+           layout="topleft"
+           left="0"
+           top="0"
+           right="-1"
+           name="dummy_icon" />
+      </panel>
+      <panel
+       follows="top|left|right"
+       height="25"
+       left_pad="168"
+       right="-33"
+       layout="topleft"
       name="dummy_panel">
          <text
           type="string"
@ -453,15 +470,6 @@
           right="-8">
          Elements
          </text>
-          <icon
-           follows="top|left|right"
-           height="25"
-           image_name="Toolbar_Middle_Off"
-           layout="topleft"
-           left="0"
-           top="0"
-           right="-1"
-           name="dummy_icon" />
      </panel>
      <panel
       follows="top|right"
--- a/indra/newview/skins/starlightcui/xui/en/floater_tools.xml
+++ b/indra/newview/skins/starlightcui/xui/en/floater_tools.xml
@ -2973,7 +2973,7 @@ Low ↔ Lwst
             layout="topleft"
             left="10"
             name="Light Intensity"
-             top_pad="-14"
+             top_pad="-21"
             width="128" />
          <spinner bottom_delta="0"
                   decimal_digits="3"