diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-09-09 12:51:38 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-09-09 12:51:38 +0800 |
| commit | 8a9a3dc9d760db37bb963d3e5bfadafdd94ee08d (patch) | |
| tree | 22f2533527d63df3736c638c4b9c7a8059ecb4ec /indra/newview/skins/default/textures | |
| parent | 50fb526c1011d0dd623e312ff70365e32a6d50a7 (diff) | |
| parent | 12743eca6958b897d7eb3f0cf791ad8ada3fc790 (diff) | |
Merge branch 'main' into 2025.06
Diffstat (limited to 'indra/newview/skins/default/textures')
| -rw-r--r-- | indra/newview/skins/default/textures/megapahit/fps_button.png | bin | 0 -> 195 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/megapahit/mp_blue_bullet.png | bin | 0 -> 654 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/megapahit/mp_green_bullet.png | bin | 0 -> 626 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/megapahit/mp_help_bullet.png | bin | 0 -> 704 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/megapahit/mp_info_bullet.png | bin | 0 -> 490 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/megapahit/mp_red_bullet.png | bin | 0 -> 629 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/megapahit/mp_yellow_bullet.png | bin | 0 -> 648 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/textures.xml | 10 |
8 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/skins/default/textures/megapahit/fps_button.png b/indra/newview/skins/default/textures/megapahit/fps_button.png Binary files differnew file mode 100644 index 0000000000..fa436a620d --- /dev/null +++ b/indra/newview/skins/default/textures/megapahit/fps_button.png diff --git a/indra/newview/skins/default/textures/megapahit/mp_blue_bullet.png b/indra/newview/skins/default/textures/megapahit/mp_blue_bullet.png Binary files differnew file mode 100644 index 0000000000..1a27570786 --- /dev/null +++ b/indra/newview/skins/default/textures/megapahit/mp_blue_bullet.png diff --git a/indra/newview/skins/default/textures/megapahit/mp_green_bullet.png b/indra/newview/skins/default/textures/megapahit/mp_green_bullet.png Binary files differnew file mode 100644 index 0000000000..f4c28e4bc9 --- /dev/null +++ b/indra/newview/skins/default/textures/megapahit/mp_green_bullet.png diff --git a/indra/newview/skins/default/textures/megapahit/mp_help_bullet.png b/indra/newview/skins/default/textures/megapahit/mp_help_bullet.png Binary files differnew file mode 100644 index 0000000000..64c8933a78 --- /dev/null +++ b/indra/newview/skins/default/textures/megapahit/mp_help_bullet.png diff --git a/indra/newview/skins/default/textures/megapahit/mp_info_bullet.png b/indra/newview/skins/default/textures/megapahit/mp_info_bullet.png Binary files differnew file mode 100644 index 0000000000..c90767b9ac --- /dev/null +++ b/indra/newview/skins/default/textures/megapahit/mp_info_bullet.png diff --git a/indra/newview/skins/default/textures/megapahit/mp_red_bullet.png b/indra/newview/skins/default/textures/megapahit/mp_red_bullet.png Binary files differnew file mode 100644 index 0000000000..aeaa52b53b --- /dev/null +++ b/indra/newview/skins/default/textures/megapahit/mp_red_bullet.png diff --git a/indra/newview/skins/default/textures/megapahit/mp_yellow_bullet.png b/indra/newview/skins/default/textures/megapahit/mp_yellow_bullet.png Binary files differnew file mode 100644 index 0000000000..026fbaf56d --- /dev/null +++ b/indra/newview/skins/default/textures/megapahit/mp_yellow_bullet.png diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 94c8119d4d..40ee205090 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -934,4 +934,14 @@ with the same filename but different name <texture name="ProgressLarge_12" file_name="icons/ProgressLarge_12.png" preload="true" /> <texture name="Icon_Pointer" file_name="icons/Icon_Pointer.png" preload="false"/> + + <texture name="mp_fpsButton" file_name="megapahit/fps_button.png" preload="false" /> + + <texture name="mp_red_bullet" file_name="megapahit/mp_red_bullet.png" preload="false" /> + <texture name="mp_yellow_bullet" file_name="megapahit/mp_yellow_bullet.png" preload="false" /> + <texture name="mp_green_bullet" file_name="megapahit/mp_green_bullet.png" preload="false" /> + <texture name="mp_blue_bullet" file_name="megapahit/mp_blue_bullet.png" preload="false" /> + <texture name="mp_help_bullet" file_name="megapahit/mp_help_bullet.png" preload="false" /> + <texture name="mp_info_bullet" file_name="megapahit/mp_info_bullet.png" preload="false" /> + </textures> |
