diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-03-19 13:21:52 -0400 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-03-19 13:21:52 -0400 |
commit | a3a430651780f82afb0fd355a0abe11d88f410d6 (patch) | |
tree | a2ec3b87b2bff75904be0e7a6bf38d17c59edb68 /indra/newview/skins/default/textures/textures.xml | |
parent | b952a5e5851d1a8bc2a45f00248b051497fec71f (diff) | |
parent | f50be64167c254e27f635ad47d8940551f0c6ab4 (diff) |
automated merge viewer2.0->viewer2.0
Diffstat (limited to 'indra/newview/skins/default/textures/textures.xml')
-rw-r--r-- | indra/newview/skins/default/textures/textures.xml | 1 |
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 b1594816b2..a3e5361e76 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -247,6 +247,7 @@ with the same filename but different name <texture name="Inv_Landmark" file_name="icons/Inv_Landmark.png" preload="false" /> <texture name="Inv_Notecard" file_name="icons/Inv_Notecard.png" preload="false" /> <texture name="Inv_Object" file_name="icons/Inv_Object.png" preload="false" /> + <texture name="Inv_Object_Multi" file_name="icons/Inv_Object_Multi.png" preload="false" /> <texture name="Inv_Pants" file_name="icons/Inv_Pants.png" preload="false" /> <texture name="Inv_Script" file_name="icons/Inv_Script.png" preload="false" /> <texture name="Inv_Shirt" file_name="icons/Inv_Shirt.png" preload="false" /> |