diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-09-16 22:43:16 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-09-16 22:43:16 +0800 |
| commit | 05f6b6c827b4eebbb180483579b7c13ebc156072 (patch) | |
| tree | 9aca21e647860cba26275b0b9f75d7f9ca18889e /indra/newview/skins/default | |
| parent | 0318718c166d0f6f0b3c387163826924b20fd597 (diff) | |
| parent | 6bb3e64acab73e92de2627ddef0b1e738ff24c4a (diff) | |
Merge branch 'main' into 2024.08-DeltaFPS
Diffstat (limited to 'indra/newview/skins/default')
| -rw-r--r-- | indra/newview/skins/default/textures/textures.xml | 4 | ||||
| -rw-r--r-- | indra/newview/skins/default/textures/windows/Window_Background.png | bin | 8603 -> 6780 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/windows/Window_Foreground.png | bin | 9175 -> 6900 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/windows/Window_NoTitle_Background.png | bin | 7451 -> 0 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/windows/Window_NoTitle_Foreground.png | bin | 8707 -> 0 bytes |
5 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index b0b7dd51e2..11eafcb45d 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_NoTitle_Background.png" preload="true" + <texture name="Window_NoTitle_Background" file_name="windows/Window_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_NoTitle_Foreground.png" preload="true" + <texture name="Window_NoTitle_Foreground" file_name="windows/Window_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/Window_Background.png b/indra/newview/skins/default/textures/windows/Window_Background.png Binary files differindex 21149351c8..f19fb0300b 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 4a64fd468a..15d2ff72b6 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 differdeleted file mode 100644 index 64afa47b7c..0000000000 --- a/indra/newview/skins/default/textures/windows/Window_NoTitle_Background.png +++ /dev/null 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 differdeleted file mode 100644 index c883197d8b..0000000000 --- a/indra/newview/skins/default/textures/windows/Window_NoTitle_Foreground.png +++ /dev/null |
