diff options
| author | pavelkproductengine <pavelkproductengine@lindenlab.com> | 2015-07-15 22:59:59 +0300 |
|---|---|---|
| committer | pavelkproductengine <pavelkproductengine@lindenlab.com> | 2015-07-15 22:59:59 +0300 |
| commit | 9131f7705974c84127bcc3109d2ab1c56cb1f009 (patch) | |
| tree | 59b7494d361a9ad570ed3bcec9efdb6a5dff6166 /indra/newview/skins/default/textures | |
| parent | 02441157a0d22619ccf2a2ee735c8f5251b54fdb (diff) | |
| parent | 3d4433de504c0ac17f2d3d98d3cbc43955cc1dda (diff) | |
merge changes for MAINT-4734
Diffstat (limited to 'indra/newview/skins/default/textures')
| -rw-r--r-- | indra/newview/skins/default/textures/icons/Icon_Attachment_Large.png | bin | 0 -> 4182 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/icons/Icon_Attachment_Small.png | bin | 0 -> 3774 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/icons/Icon_Notification_Condense.png | bin | 0 -> 262 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/icons/Icon_Notification_Expand.png | bin | 0 -> 239 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/icons/System_Notification_Large.png | bin | 0 -> 1804 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/icons/System_Notification_Small.png | bin | 0 -> 661 bytes | |||
| -rwxr-xr-x | indra/newview/skins/default/textures/textures.xml | 5 |
7 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/skins/default/textures/icons/Icon_Attachment_Large.png b/indra/newview/skins/default/textures/icons/Icon_Attachment_Large.png Binary files differnew file mode 100644 index 0000000000..0732a33d93 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Icon_Attachment_Large.png diff --git a/indra/newview/skins/default/textures/icons/Icon_Attachment_Small.png b/indra/newview/skins/default/textures/icons/Icon_Attachment_Small.png Binary files differnew file mode 100644 index 0000000000..8124554902 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Icon_Attachment_Small.png diff --git a/indra/newview/skins/default/textures/icons/Icon_Notification_Condense.png b/indra/newview/skins/default/textures/icons/Icon_Notification_Condense.png Binary files differnew file mode 100644 index 0000000000..4d245eb57a --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Icon_Notification_Condense.png diff --git a/indra/newview/skins/default/textures/icons/Icon_Notification_Expand.png b/indra/newview/skins/default/textures/icons/Icon_Notification_Expand.png Binary files differnew file mode 100644 index 0000000000..186822da43 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Icon_Notification_Expand.png diff --git a/indra/newview/skins/default/textures/icons/System_Notification_Large.png b/indra/newview/skins/default/textures/icons/System_Notification_Large.png Binary files differnew file mode 100644 index 0000000000..434ce3e8b6 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/System_Notification_Large.png diff --git a/indra/newview/skins/default/textures/icons/System_Notification_Small.png b/indra/newview/skins/default/textures/icons/System_Notification_Small.png Binary files differnew file mode 100644 index 0000000000..027a8446d8 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/System_Notification_Small.png diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 408ee39f9b..d9296d522b 100755 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -798,4 +798,9 @@ with the same filename but different name <texture name="Camera_Drag_Dot" file_name="world/CameraDragDot.png"/> <texture name="NavBar Separator" file_name="navbar/separator.png"/> + <texture name="Notification_Condense" file_name="icons/Icon_Notification_Condense.png" preload="true"/> + <texture name="Notification_Expand" file_name="icons/Icon_Notification_Expand.png" preload="true"/> + <texture name="System_Notification" file_name="icons/SL_Logo.png" preload="true"/> + <texture name="Icon_Attachment_Small" file_name="icons/Icon_Attachment_Small.png" preload="true"/> + <texture name="Icon_Attachment_Large" file_name="icons/Icon_Attachment_Large.png" preload="true"/> </textures> |
