summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorMnikolenko Productengine <mnikolenko@productengine.com>2021-06-25 20:05:07 +0300
committerMnikolenko Productengine <mnikolenko@productengine.com>2021-06-25 20:05:07 +0300
commit74c6580e5c3507ef72590a3543e2b0b2ee9c13a3 (patch)
tree1abb5c7f1cd19e4b8b75f2f87ea4203013aa1718 /indra/newview/skins/default
parentf6a5bda34b4c574cf198c6c2b4131c18d3b68fc0 (diff)
SL-15297 WIP restore selection after updating the list & don't show avatars in the list as disabled when complexity is not limited
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/colors.xml5
-rw-r--r--indra/newview/skins/default/xui/en/floater_add_payment_method.xml2
-rw-r--r--indra/newview/skins/default/xui/en/floater_performance.xml12
3 files changed, 8 insertions, 11 deletions
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 9fcb6edca4..e8d3c12d39 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -967,10 +967,7 @@
name="OutfitGalleryItemUnselected"
value="0.4 0.4 0.4 1" />
<color
- name="AddPaymentPanel"
- value="0.27 0.27 0.27 1" />
- <color
- name="PerformanceFloaterGray"
+ name="PanelGray"
value="0.27 0.27 0.27 1" />
<color
name="PerformanceMid"
diff --git a/indra/newview/skins/default/xui/en/floater_add_payment_method.xml b/indra/newview/skins/default/xui/en/floater_add_payment_method.xml
index 1f980564d4..ac88263aa1 100644
--- a/indra/newview/skins/default/xui/en/floater_add_payment_method.xml
+++ b/indra/newview/skins/default/xui/en/floater_add_payment_method.xml
@@ -19,7 +19,7 @@
</floater.string>
<panel
background_opaque="false"
- bg_alpha_color="AddPaymentPanel"
+ bg_alpha_color="PanelGray"
border_visible="false"
background_visible="true"
label="wrapper_panel"
diff --git a/indra/newview/skins/default/xui/en/floater_performance.xml b/indra/newview/skins/default/xui/en/floater_performance.xml
index 4cd3c7a603..039421d589 100644
--- a/indra/newview/skins/default/xui/en/floater_performance.xml
+++ b/indra/newview/skins/default/xui/en/floater_performance.xml
@@ -75,7 +75,7 @@
left="0"
top="60">
<panel
- bg_alpha_color="PerformanceFloaterGray"
+ bg_alpha_color="PanelGray"
background_visible="true"
background_opaque="false"
border="true"
@@ -122,7 +122,7 @@
right="-20"/>
</panel>
<panel
- bg_alpha_color="PerformanceFloaterGray"
+ bg_alpha_color="PanelGray"
background_visible="true"
background_opaque="false"
border="true"
@@ -168,7 +168,7 @@
right="-20"/>
</panel>
<panel
- bg_alpha_color="PerformanceFloaterGray"
+ bg_alpha_color="PanelGray"
background_visible="true"
background_opaque="false"
border="true"
@@ -225,7 +225,7 @@
right="-20"/>
</panel>
<panel
- bg_alpha_color="PerformanceFloaterGray"
+ bg_alpha_color="PanelGray"
background_visible="true"
background_opaque="false"
border="true"
@@ -282,7 +282,7 @@
right="-20"/>
</panel>
<panel
- bg_alpha_color="PerformanceFloaterGray"
+ bg_alpha_color="PanelGray"
background_visible="true"
background_opaque="false"
border="true"
@@ -339,7 +339,7 @@
right="-20"/>
</panel>
<panel
- bg_alpha_color="PerformanceFloaterGray"
+ bg_alpha_color="PanelGray"
background_visible="true"
background_opaque="false"
border="true"