diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-08-12 19:03:20 +0000 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-08-12 19:03:20 +0000 |
| commit | 7bbc5cdea6beb4e05c26d1472f789fe6fa536ee3 (patch) | |
| tree | 9e496156bb377c9bdf0b793a1b07b72dfa4f032c /indra/newview/app_settings | |
| parent | 0bf4b5f2222ffb8171be094613363427f3b8470a (diff) | |
svn merge -r129617:130277 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-5 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
For DEV-34223 : AVP Current Outfit Folder
For DEV-37485 : AVP Appearance Side Panel
For DEV-35335 : AVP Automatic Folder Classification
This merges the Appearance Side Panel / Ensemble Typing / Current Outfit Folder work for the AVP team.
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/foldertypes.xml | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/indra/newview/app_settings/foldertypes.xml b/indra/newview/app_settings/foldertypes.xml index 4d4d479bdd..698158308e 100644 --- a/indra/newview/app_settings/foldertypes.xml +++ b/indra/newview/app_settings/foldertypes.xml @@ -9,50 +9,66 @@ asset_num="27" xui_name="head" icon_name="inv_folder_outfit_head.tga" + allowed="hair,eyes" /> <ensemble asset_num="28" xui_name="gloves" icon_name="inv_folder_outfit_gloves.tga" + allowed="gloves" /> <ensemble asset_num="29" xui_name="jacket" icon_name="inv_folder_outfit_jacket.tga" + allowed="jacket" /> <ensemble asset_num="30" xui_name="pants" icon_name="inv_folder_outfit_pants.tga" + allowed="pants,underpants" /> <ensemble asset_num="31" xui_name="shape" icon_name="inv_folder_outfit_shape.tga" + allowed="shape,skin,hair,eyes" /> <ensemble asset_num="32" xui_name="shoes" icon_name="inv_folder_outfit_shoes.tga" + allowed="shoes,socks" /> <ensemble asset_num="33" xui_name="shirt" icon_name="inv_folder_outfit_shirt.tga" + allowed="shirt,undershirt" /> <ensemble asset_num="34" xui_name="skirt" icon_name="inv_folder_outfit_skirt.tga" + allowed="" /> <ensemble asset_num="35" xui_name="underpants" icon_name="inv_folder_outfit_underpants.tga" + allowed="underpants" /> <ensemble asset_num="36" xui_name="undershirt" 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> |