diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-12 15:43:34 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-12 15:43:34 +0300 |
| commit | eab5beb54cacc2b0dc2cddad4a78634e7468a298 (patch) | |
| tree | 51f17910f529af57819bcd77f1a7dd9e92f6291e /indra/newview/skins/default/textures | |
| parent | 00e09ddcad8ec2c33ecbcdd0da09bd7819bc3509 (diff) | |
| parent | cc8fdf341dbbe6ab940d7b24bcf81cbed252cb69 (diff) | |
Merge branch 'main' into marchcat/x-merge
# Conflicts:
# indra/llimage/llimageworker.cpp
# indra/llimage/llimageworker.h
# indra/newview/llcontrolavatar.cpp
# indra/newview/llfloaterprofiletexture.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/lloutfitslist.h
# indra/newview/lltexturefetch.cpp
Diffstat (limited to 'indra/newview/skins/default/textures')
| -rw-r--r-- | indra/newview/skins/default/textures/icons/Icon_Color_Palette.png | bin | 0 -> 3419 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/icons/Icon_Font_Size.png | bin | 0 -> 2994 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/icons/VoiceMute_Off.png | bin | 0 -> 753 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/textures.xml | 3 |
4 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/skins/default/textures/icons/Icon_Color_Palette.png b/indra/newview/skins/default/textures/icons/Icon_Color_Palette.png Binary files differnew file mode 100644 index 0000000000..28906001ea --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Icon_Color_Palette.png diff --git a/indra/newview/skins/default/textures/icons/Icon_Font_Size.png b/indra/newview/skins/default/textures/icons/Icon_Font_Size.png Binary files differnew file mode 100644 index 0000000000..37bdde69aa --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Icon_Font_Size.png diff --git a/indra/newview/skins/default/textures/icons/VoiceMute_Off.png b/indra/newview/skins/default/textures/icons/VoiceMute_Off.png Binary files differnew file mode 100644 index 0000000000..425ba267a5 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/VoiceMute_Off.png diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 275d8d635c..97468c3b2e 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -63,6 +63,7 @@ with the same filename but different name <texture name="AudioMute_Off" file_name="icons/AudioMute_Off.png" preload="false" /> <texture name="AudioMute_Over" file_name="icons/AudioMute_Over.png" preload="false" /> + <texture name="VoiceMute_Off" file_name="icons/VoiceMute_Off.png" preload="false" /> <texture name="Audio_Off" file_name="icons/Audio_Off.png" preload="false" /> <texture name="Audio_Press" file_name="icons/Audio_Press.png" preload="false" /> @@ -904,4 +905,6 @@ with the same filename but different name <texture name="Single_Folder_Back" file_name="icons/single_folder_back.png" preload="true"/> <texture name="Single_Folder_Forward" file_name="icons/single_folder_forward.png" preload="true"/> <texture name="Single_Folder_Up" file_name="icons/single_folder_up.png" preload="true"/> + <texture name="Icon_Color_Palette" file_name="icons/Icon_Color_Palette.png" preload="false"/> + <texture name="Icon_Font_Size" file_name="icons/Icon_Font_Size.png" preload="false"/> </textures> |
