diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-12-26 14:01:17 +0200 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-12-26 14:01:17 +0200 |
commit | 970b6661cddc6bad32f874d3f7676f5e5d5c5ec3 (patch) | |
tree | 63ffcce826a99ac45a71c820f9485297644e95ba /indra/newview/skins/default/textures | |
parent | c9343c400487979c206f0bc5fa3d04d70de6870a (diff) | |
parent | 0a873cd95547f003878c6d00d0883ff792f4a865 (diff) |
Merge branch 'master' into DRTVWR-543-maint
Diffstat (limited to 'indra/newview/skins/default/textures')
-rw-r--r-- | indra/newview/skins/default/textures/textures.xml | 3 | ||||
-rw-r--r-- | indra/newview/skins/default/textures/toolbar_icons/360_capture.png | bin | 0 -> 793 bytes |
2 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 6104e99a4b..03e23b5ba3 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -131,7 +131,8 @@ with the same filename but different name <texture name="Check_Mark" file_name="icons/check_mark.png" preload="true" /> <texture name="Checker" file_name="checker.png" preload="false" /> - + + <texture name="Command_360_Capture_Icon" file_name="toolbar_icons/360_capture.png" preload="true" /> <texture name="Command_AboutLand_Icon" file_name="toolbar_icons/land.png" preload="true" /> <texture name="Command_Appearance_Icon" file_name="toolbar_icons/appearance.png" preload="true" /> <texture name="Command_Avatar_Icon" file_name="toolbar_icons/avatars.png" preload="true" /> diff --git a/indra/newview/skins/default/textures/toolbar_icons/360_capture.png b/indra/newview/skins/default/textures/toolbar_icons/360_capture.png Binary files differnew file mode 100644 index 0000000000..163cebe29f --- /dev/null +++ b/indra/newview/skins/default/textures/toolbar_icons/360_capture.png |