diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-10-23 15:21:49 +0000 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-10-23 15:21:49 +0000 |
| commit | 584962d5c79097904fec0102f78ea4aa7482a337 (patch) | |
| tree | 95c79b7a41e5c39d3e1f3d7e5710842cd12c3425 /indra/newview/app_settings | |
| parent | 9c3ae7a2436c970d3959938ddc29c2d291844ecc (diff) | |
svn merge -r137024:137071 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/avatar-pipeline-14-seraph into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
Bugs: EXT-1785 EXT-1818 EXT-1820 EXT-1845
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/foldertypes.xml | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/indra/newview/app_settings/foldertypes.xml b/indra/newview/app_settings/foldertypes.xml index 698158308e..2038779c4f 100644 --- a/indra/newview/app_settings/foldertypes.xml +++ b/indra/newview/app_settings/foldertypes.xml @@ -65,10 +65,4 @@ icon_name="inv_folder_outfit_undershirt.tga" allowed="undershirt" /> - <ensemble - asset_num="47" - xui_name="outfit" - icon_name="inv_folder_outfit.tga" - allowed="outfit" - /> </ensemble_defs> |