diff options
| author | Rider Linden <rider@lindenlab.com> | 2015-10-27 15:45:21 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2015-10-27 15:45:21 -0700 |
| commit | b1c3ec9c0049758afbe9e13d31cc2f60348ecffb (patch) | |
| tree | 9da64a10bee7c90ac671db21df68b9e78ca72c7c /indra/newview/skins/default/textures | |
| parent | 9833a50260fb45d5f0033200ae756834c0cc9940 (diff) | |
| parent | 4ee02ce01a220aaf63f10c2a00556b13c7892de3 (diff) | |
Merge
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 a5f2ce1f84..e453d94883 100755 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -804,4 +804,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> |
