summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/textures
diff options
context:
space:
mode:
authorcallum <none@none>2009-12-28 13:45:57 -0800
committercallum <none@none>2009-12-28 13:45:57 -0800
commit3519435bbfeec4c838d5ffbe008d0ac7bbc085a8 (patch)
tree5d590d84a1fa6c8414adba0732a83a67a440dd37 /indra/newview/skins/default/textures
parentdd1fb1568e85a8e3622372cae21bcd3205051718 (diff)
parent6008bf61b2d0475a274ad2b851b61e69496b5bf8 (diff)
Merge with (specific revision) and head
Diffstat (limited to 'indra/newview/skins/default/textures')
-rw-r--r--indra/newview/skins/default/textures/icons/avaline_default_icon.jpgbin0 -> 3951 bytes
-rw-r--r--indra/newview/skins/default/textures/textures.xml2
2 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/skins/default/textures/icons/avaline_default_icon.jpg b/indra/newview/skins/default/textures/icons/avaline_default_icon.jpg
new file mode 100644
index 0000000000..3bb7f7183c
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/avaline_default_icon.jpg
Binary files differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 8a9126208a..95db84cb32 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -70,6 +70,8 @@ with the same filename but different name
<texture name="Audio_Over" file_name="icons/Audio_Over.png" preload="false" />
<texture name="Audio_Press" file_name="icons/Audio_Press.png" preload="false" />
+ <texture name="Avaline_Icon" file_name="icons/avaline_default_icon.jpg" preload="true" />
+
<texture name="BackArrow_Disabled" file_name="icons/BackArrow_Disabled.png" preload="false" />
<texture name="BackArrow_Off" file_name="icons/BackArrow_Off.png" preload="false" />
<texture name="BackArrow_Press" file_name="icons/BackArrow_Press.png" preload="false" />