diff options
author | Erik Kundiman <erik@megapahit.org> | 2024-07-16 20:59:28 +0800 |
---|---|---|
committer | Erik Kundiman <erik@megapahit.org> | 2024-07-16 20:59:28 +0800 |
commit | e8d81fe0a20021452e611793d23bda00c82196de (patch) | |
tree | 1e6ede73198dbe9a96640fd2db538addf2de9ae7 /indra/newview/skins/default | |
parent | c8c1243948bca57295086b86501d81eecbbe7dff (diff) | |
parent | c2de1148bb7aba65bd313891710cdc571c8b28cf (diff) |
Merge branch 'main' into maint-b
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r-- | indra/newview/skins/default/colors.xml | 2 | ||||
-rw-r--r-- | indra/newview/skins/default/textures/bottomtray/WellButton_Lit.png | bin | 4456 -> 5762 bytes | |||
-rw-r--r-- | indra/newview/skins/default/textures/bottomtray/WellButton_Lit_Selected.png | bin | 4455 -> 5762 bytes | |||
-rw-r--r-- | indra/newview/skins/default/xui/en/floater_gesture.xml | 2 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/en/floater_my_environments.xml | 6 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/en/floater_world_map.xml | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml index 73e9c85f4d..1fd46fc637 100644 --- a/indra/newview/skins/default/colors.xml +++ b/indra/newview/skins/default/colors.xml @@ -519,7 +519,7 @@ reference="White_10" /> <color name="MapParcelOutlineColor" - value="1 1 0 0.5" /> + value="1 1 1 0.5" /> <color name="MapTrackColor" reference="Red" /> diff --git a/indra/newview/skins/default/textures/bottomtray/WellButton_Lit.png b/indra/newview/skins/default/textures/bottomtray/WellButton_Lit.png Binary files differindex 63e07a31d4..84711ddc29 100644 --- a/indra/newview/skins/default/textures/bottomtray/WellButton_Lit.png +++ b/indra/newview/skins/default/textures/bottomtray/WellButton_Lit.png diff --git a/indra/newview/skins/default/textures/bottomtray/WellButton_Lit_Selected.png b/indra/newview/skins/default/textures/bottomtray/WellButton_Lit_Selected.png Binary files differindex 2aa31478d8..9b9468c574 100644 --- a/indra/newview/skins/default/textures/bottomtray/WellButton_Lit_Selected.png +++ b/indra/newview/skins/default/textures/bottomtray/WellButton_Lit_Selected.png diff --git a/indra/newview/skins/default/xui/en/floater_gesture.xml b/indra/newview/skins/default/xui/en/floater_gesture.xml index 832716c600..7fce91a2c3 100644 --- a/indra/newview/skins/default/xui/en/floater_gesture.xml +++ b/indra/newview/skins/default/xui/en/floater_gesture.xml @@ -52,7 +52,7 @@ width="80" /> </scroll_list> <panel - background_visible="true" + background_visible="false" bevel_style="none" top_pad="0" follows="left|right|bottom" diff --git a/indra/newview/skins/default/xui/en/floater_my_environments.xml b/indra/newview/skins/default/xui/en/floater_my_environments.xml index 8c9c450d7c..dd0795305e 100644 --- a/indra/newview/skins/default/xui/en/floater_my_environments.xml +++ b/indra/newview/skins/default/xui/en/floater_my_environments.xml @@ -26,8 +26,8 @@ bottom="-5" orientation="vertical"> <layout_panel - border="true" - bevel_style="in" + border="false" + bevel_style="none" auto_resize="false" tab_group="1" height="54" @@ -147,7 +147,7 @@ name="pnl_control" font="SansSerifBold"> <panel - background_visible="true" + background_visible="false" bevel_style="none" top_pad="1" follows="top|left|right" diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml index cbe4616b40..2298005d73 100644 --- a/indra/newview/skins/default/xui/en/floater_world_map.xml +++ b/indra/newview/skins/default/xui/en/floater_world_map.xml @@ -571,7 +571,7 @@ </button> <scroll_list draw_stripes="false" - bg_writeable_color="Transparent" + bg_writeable_color="0.75 0.75 0.75 0.15" follows="all" height="145" layout="topleft" |