diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-08-18 15:34:09 +0000 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-08-18 15:34:09 +0000 |
| commit | ac1b723fd79b63a9dab94c839d3c0acb2ddde129 (patch) | |
| tree | 4da36d5bae02191ce86dea8b5b074b48f516a3ae /indra/newview/skins/default/textures/textures.xml | |
| parent | d53725ece11eb3403128dd77834742a1d084138f (diff) | |
svn merge -r130469:130817 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-6 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
This merges in all appearance side panel bug fixes.
Diffstat (limited to 'indra/newview/skins/default/textures/textures.xml')
| -rw-r--r-- | indra/newview/skins/default/textures/textures.xml | 2 |
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 1515a34eeb..ad208806b7 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -414,6 +414,8 @@ <texture name="inv_item_jacket.tga"/> <texture name="inv_item_landmark.tga"/> <texture name="inv_item_landmark_visited.tga"/> + <texture name="inv_item_linkitem.tga"/> + <texture name="inv_item_linkfolder.tga"/> <texture name="inv_item_notecard.tga"/> <texture name="inv_item_object.tga"/> <texture name="inv_item_object_multi.tga"/> |