summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/textures/textures.xml
diff options
context:
space:
mode:
authorBrad Kittenbrink <brad@lindenlab.com>2022-08-04 10:59:26 -0700
committerBrad Kittenbrink <brad@lindenlab.com>2022-08-04 10:59:26 -0700
commit38208441db5e969112a4b911aa4d063d5a1031f2 (patch)
tree84158d6183058b48737ba9b19304bd4ae5f57afa /indra/newview/skins/default/textures/textures.xml
parent92b09e3a164e59f5a0c4e436d044590513ddc6bd (diff)
parent9dba9f80f4d40ec12a735ddbb66a9d103a959ece (diff)
Merge remote-tracking branch 'origin/master' into DRTVWR-559
Diffstat (limited to 'indra/newview/skins/default/textures/textures.xml')
-rw-r--r--indra/newview/skins/default/textures/textures.xml9
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 84ca634600..f18dff5b22 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -448,6 +448,13 @@ with the same filename but different name
<texture name="OptionsMenu_Off" file_name="icons/OptionsMenu_Off.png" preload="false" />
<texture name="OptionsMenu_Press" file_name="icons/OptionsMenu_Press.png" preload="false" />
+ <texture name="ClipboardSmallMenu_Disabled" file_name="icons/ClipboardSmallMenu_Disabled.png" preload="false" />
+ <texture name="ClipboardSmallMenu_Off" file_name="icons/ClipboardSmallMenu_Off.png" preload="false" />
+ <texture name="ClipboardSmallMenu_Press" file_name="icons/ClipboardSmallMenu_Press.png" preload="false" />
+ <texture name="ClipboardMenu_Disabled" file_name="icons/ClipboardMenu_Disabled.png" preload="false" />
+ <texture name="ClipboardMenu_Off" file_name="icons/ClipboardMenu_Off.png" preload="false" />
+ <texture name="ClipboardMenu_Press" file_name="icons/ClipboardMenu_Press.png" preload="false" />
+
<texture name="OutboxStatus_Success" file_name="green_checkmark.png" preload="false" />
<texture name="OutboxStatus_Warning" file_name="icons/pop_up_caution.png" preload="false" />
<texture name="OutboxStatus_Error" file_name="red_x.png" preload="false" />
@@ -804,6 +811,8 @@ with the same filename but different name
<texture name="map_infohub.tga" />
<texture name="map_telehub.tga" />
<texture name="map_track_16.tga" />
+ <texture name="map_ui_collapse_icon.png" />
+ <texture name="map_ui_expand_icon.png" />
<texture name="notify_caution_icon.tga" />