diff options
author | Erik Kundiman <erik@megapahit.org> | 2024-08-23 20:30:38 +0800 |
---|---|---|
committer | Erik Kundiman <erik@megapahit.org> | 2024-08-23 20:30:38 +0800 |
commit | fd7a08906d2775a950866b2d6cb9222a52bea917 (patch) | |
tree | d47c1905a924a492de02632d4bde3a337fda3e21 /indra/newview | |
parent | 304377e015100ea38169106956f43993387e8480 (diff) | |
parent | ec6e4e9d0682851deab96b55b9f57ea4889eb557 (diff) |
Merge remote-tracking branch 'secretfoxtail/main'
Diffstat (limited to 'indra/newview')
-rw-r--r-- | indra/newview/skins/default/textures/icons/Info_Over.png | bin | 5572 -> 5810 bytes | |||
-rw-r--r-- | indra/newview/skins/default/textures/icons/back_arrow_off.png | bin | 5633 -> 5862 bytes | |||
-rw-r--r-- | indra/newview/skins/default/textures/icons/back_arrow_over.png | bin | 5658 -> 6119 bytes | |||
-rw-r--r-- | indra/newview/skins/default/textures/icons/back_arrow_press.png | bin | 5752 -> 6223 bytes | |||
-rw-r--r-- | indra/newview/skins/default/textures/textures.xml | 4 | ||||
-rw-r--r-- | indra/newview/skins/default/textures/windows/Inspector_I.png | bin | 5572 -> 5812 bytes | |||
-rw-r--r-- | indra/newview/skins/default/textures/windows/Window_Background.png | bin | 6780 -> 7708 bytes | |||
-rw-r--r-- | indra/newview/skins/default/textures/windows/Window_Foreground.png | bin | 6900 -> 8056 bytes | |||
-rw-r--r-- | indra/newview/skins/default/textures/windows/Window_NoTitle_Background.png | bin | 0 -> 7451 bytes | |||
-rw-r--r-- | indra/newview/skins/default/textures/windows/Window_NoTitle_Foreground.png | bin | 0 -> 8490 bytes | |||
-rw-r--r-- | indra/newview/skins/default/xui/en/panel_avatar_list_item.xml | 4 |
11 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/skins/default/textures/icons/Info_Over.png b/indra/newview/skins/default/textures/icons/Info_Over.png Binary files differindex 82d650ef4b..11bf174ec6 100644 --- a/indra/newview/skins/default/textures/icons/Info_Over.png +++ b/indra/newview/skins/default/textures/icons/Info_Over.png diff --git a/indra/newview/skins/default/textures/icons/back_arrow_off.png b/indra/newview/skins/default/textures/icons/back_arrow_off.png Binary files differindex d0d8b31006..0adf0b677e 100644 --- a/indra/newview/skins/default/textures/icons/back_arrow_off.png +++ b/indra/newview/skins/default/textures/icons/back_arrow_off.png diff --git a/indra/newview/skins/default/textures/icons/back_arrow_over.png b/indra/newview/skins/default/textures/icons/back_arrow_over.png Binary files differindex 4a247e0f1f..13ce6a8e4d 100644 --- a/indra/newview/skins/default/textures/icons/back_arrow_over.png +++ b/indra/newview/skins/default/textures/icons/back_arrow_over.png diff --git a/indra/newview/skins/default/textures/icons/back_arrow_press.png b/indra/newview/skins/default/textures/icons/back_arrow_press.png Binary files differindex 3e9f1a6e96..311a90ac22 100644 --- a/indra/newview/skins/default/textures/icons/back_arrow_press.png +++ b/indra/newview/skins/default/textures/icons/back_arrow_press.png diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 11eafcb45d..b0b7dd51e2 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -780,9 +780,9 @@ with the same filename but different name scale.left="4" scale.top="24" scale.right="26" scale.bottom="4" /> <texture name="Window_Foreground" file_name="windows/Window_Foreground.png" preload="true" scale.left="4" scale.top="24" scale.right="26" scale.bottom="4" /> - <texture name="Window_NoTitle_Background" file_name="windows/Window_Background.png" preload="true" + <texture name="Window_NoTitle_Background" file_name="windows/Window_NoTitle_Background.png" preload="true" scale.left="4" scale.top="24" scale.right="26" scale.bottom="4" /> - <texture name="Window_NoTitle_Foreground" file_name="windows/Window_Foreground.png" preload="true" + <texture name="Window_NoTitle_Foreground" file_name="windows/Window_NoTitle_Foreground.png" preload="true" scale.left="4" scale.top="24" scale.right="26" scale.bottom="4" /> <texture name="YouAreHere_Badge" file_name="icons/YouAreHere_Badge.png" preload="false" /> diff --git a/indra/newview/skins/default/textures/windows/Inspector_I.png b/indra/newview/skins/default/textures/windows/Inspector_I.png Binary files differindex 82d650ef4b..c36555c90d 100644 --- a/indra/newview/skins/default/textures/windows/Inspector_I.png +++ b/indra/newview/skins/default/textures/windows/Inspector_I.png diff --git a/indra/newview/skins/default/textures/windows/Window_Background.png b/indra/newview/skins/default/textures/windows/Window_Background.png Binary files differindex f19fb0300b..83b45f9343 100644 --- a/indra/newview/skins/default/textures/windows/Window_Background.png +++ b/indra/newview/skins/default/textures/windows/Window_Background.png diff --git a/indra/newview/skins/default/textures/windows/Window_Foreground.png b/indra/newview/skins/default/textures/windows/Window_Foreground.png Binary files differindex 15d2ff72b6..db4b58916f 100644 --- a/indra/newview/skins/default/textures/windows/Window_Foreground.png +++ b/indra/newview/skins/default/textures/windows/Window_Foreground.png diff --git a/indra/newview/skins/default/textures/windows/Window_NoTitle_Background.png b/indra/newview/skins/default/textures/windows/Window_NoTitle_Background.png Binary files differnew file mode 100644 index 0000000000..64afa47b7c --- /dev/null +++ b/indra/newview/skins/default/textures/windows/Window_NoTitle_Background.png diff --git a/indra/newview/skins/default/textures/windows/Window_NoTitle_Foreground.png b/indra/newview/skins/default/textures/windows/Window_NoTitle_Foreground.png Binary files differnew file mode 100644 index 0000000000..4478cf0a15 --- /dev/null +++ b/indra/newview/skins/default/textures/windows/Window_NoTitle_Foreground.png diff --git a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml index cfca246321..51cc6d2257 100644 --- a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml @@ -64,7 +64,7 @@ top="6" use_ellipses="true" value="(loading)" - width="180" /> + width="80" /> <text follows="left|right" font="SansSerifSmall" @@ -75,7 +75,7 @@ top="6" text_color="LtGray_50" value="0s" - width="35" /> + width="50" /> <text follows="left|right" font="SansSerifSmall" |