summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/textures/textures.xml
diff options
context:
space:
mode:
authorGraham Madarasz <graham@lindenlab.com>2013-05-07 12:42:32 -0700
committerGraham Madarasz <graham@lindenlab.com>2013-05-07 12:42:32 -0700
commit1f5f0a4b060ca22ccc6b5764cb8f947d68ec87e2 (patch)
tree240f028339bc20371e73bda0161c5e5b44a6f6e8 /indra/newview/skins/default/textures/textures.xml
parent792f606093daf89873342d3465eda296e329d407 (diff)
parent29246e8a1fa1f8ebec307cc32017910d1e4ab5f4 (diff)
Merge vwr-dev-mat
Diffstat (limited to 'indra/newview/skins/default/textures/textures.xml')
-rwxr-xr-xindra/newview/skins/default/textures/textures.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index fcab966dee..b0e4b71d21 100755
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -743,6 +743,7 @@ with the same filename but different name
<texture name="default_land_picture.j2c" />
<texture name="default_profile_picture.j2c" />
<texture name="locked_image.j2c" />
+ <texture name="materials_ui_x_24.png" />
<texture name="Progress_1" file_name="icons/Progress_1.png" preload="true" />
<texture name="Progress_2" file_name="icons/Progress_2.png" preload="true" />