summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2023-09-19 22:55:25 +0800
committerErik Kundiman <erik@megapahit.org>2023-09-19 22:55:25 +0800
commit87c263cd27f682c2df54ede92184f92ce3712d2b (patch)
treec93e49d1ab6be58c51a893b6ff327ee3d9e10d85 /indra/newview
parent65f7c08ef3a68981d74336a0160ec3d0ce97337d (diff)
parent53c04e9a99192c0775a33cfc634d13fa1c0b9e72 (diff)
Merge branch 'main' into DRTVWR-559
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/skins/default/colors.xml2
-rw-r--r--indra/newview/skins/default/textures/windows/login_mp_logo.pngbin12760 -> 22788 bytes
-rw-r--r--indra/newview/skins/default/textures/windows/login_mp_logo_small.pngbin12758 -> 17965 bytes
-rw-r--r--indra/newview/skins/default/xui/en/panel_login.xml2
4 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 6efe302f30..a6820086fc 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -527,7 +527,7 @@
value="0.5 0 0 1" />
<color
name="MenuBarBgColor"
- reference="DkGray" />
+ reference="Black" />
<color
name="MenuBarGodBgColor"
reference="FrogGreen" />
diff --git a/indra/newview/skins/default/textures/windows/login_mp_logo.png b/indra/newview/skins/default/textures/windows/login_mp_logo.png
index bee5252361..3f8b315b7b 100644
--- a/indra/newview/skins/default/textures/windows/login_mp_logo.png
+++ b/indra/newview/skins/default/textures/windows/login_mp_logo.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/windows/login_mp_logo_small.png b/indra/newview/skins/default/textures/windows/login_mp_logo_small.png
index 2e32be796d..e5f6f0bde1 100644
--- a/indra/newview/skins/default/textures/windows/login_mp_logo_small.png
+++ b/indra/newview/skins/default/textures/windows/login_mp_logo_small.png
Binary files differ
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 7e9f4b201c..55493591a3 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -5,7 +5,7 @@
name="panel_login"
focus_root="true"
background_visible="true"
- bg_opaque_color="0.16 0.16 0.16 1"
+ bg_opaque_color="0.0 0.0 0.0 1"
background_opaque="true"
width="1024">
<panel.string