summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/textures/textures.xml
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2012-09-26 17:17:31 -0700
committerMerov Linden <merov@lindenlab.com>2012-09-26 17:17:31 -0700
commitc92a83fe01f2201361f2f3b9770308aac00093e8 (patch)
treeec199de8c835f8b1c7d5f61659b9707fa7d252c7 /indra/newview/skins/default/textures/textures.xml
parent9e1ea5a1652528dead811dee8904ae8a6833d163 (diff)
parent976a2f5a442150ef89cff6b39450eabbca956d0f (diff)
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/newview/skins/default/textures/textures.xml')
-rw-r--r--indra/newview/skins/default/textures/textures.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 47b0c12fa0..a124041565 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -363,6 +363,8 @@ with the same filename but different name
<texture name="NavBar_BG_NoFav_Bevel" file_name="navbar/NavBar_BG_NoFav_Bevel.png" preload="true" scale.left="1" scale.top="1" scale.right="0" scale.bottom="0" />
<texture name="NavBar_BG_NoNav_Bevel" file_name="navbar/NavBar_BG_NoNav_Bevel.png" preload="true" scale.left="1" scale.top="1" scale.right="0" scale.bottom="0" />
+ <texture name="Nearby_chat_icon" file_name="icons/nearby_chat_icon.png" preload="false" />
+
<texture name="Notices_Unread" file_name="bottomtray/Notices_Unread.png" preload="true" />
<texture name="NoEntryLines" file_name="world/NoEntryLines.png" use_mips="true" preload="false" />