diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-07-23 23:41:12 +0000 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-07-23 23:41:12 +0000 |
| commit | 363de6c3bc231183224aed8ba287efe450adb00b (patch) | |
| tree | a75bd8d0449ab119f25db4b0024989cba0b71697 /indra/newview/app_settings | |
| parent | 80deb2a5358e5e912455a781b0d4aa5f29080e30 (diff) | |
svn merge -r 127683:128178 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/folder-links__merge__viewer-2.0.0.3-r127634 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
For DEV-36425 : Viewer merge for Folder Links and Types [VIEWER]
Test plans - EXTERNAL
* [ Test against a 1.30 server ]
* Test various inventory operations -- move, copy, paste-as-link, etc. on both folders and inventory items.
* Test ability to change user-created folder types. Test inventory operations on these folder types.
Test plans - INTERNAL
* Test against any inventory smoke tests.
* See test plan in QAR-1643 for full FolderLinks&Types test plan.
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/foldertypes.xml | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/indra/newview/app_settings/foldertypes.xml b/indra/newview/app_settings/foldertypes.xml new file mode 100644 index 0000000000..4d4d479bdd --- /dev/null +++ b/indra/newview/app_settings/foldertypes.xml @@ -0,0 +1,58 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<ensemble_defs> + <ensemble + asset_num="-1" + xui_name="default" + icon_name="inv_plain_closed.tga" + /> + <ensemble + asset_num="27" + xui_name="head" + icon_name="inv_folder_outfit_head.tga" + /> + <ensemble + asset_num="28" + xui_name="gloves" + icon_name="inv_folder_outfit_gloves.tga" + /> + <ensemble + asset_num="29" + xui_name="jacket" + icon_name="inv_folder_outfit_jacket.tga" + /> + <ensemble + asset_num="30" + xui_name="pants" + icon_name="inv_folder_outfit_pants.tga" + /> + <ensemble + asset_num="31" + xui_name="shape" + icon_name="inv_folder_outfit_shape.tga" + /> + <ensemble + asset_num="32" + xui_name="shoes" + icon_name="inv_folder_outfit_shoes.tga" + /> + <ensemble + asset_num="33" + xui_name="shirt" + icon_name="inv_folder_outfit_shirt.tga" + /> + <ensemble + asset_num="34" + xui_name="skirt" + icon_name="inv_folder_outfit_skirt.tga" + /> + <ensemble + asset_num="35" + xui_name="underpants" + icon_name="inv_folder_outfit_underpants.tga" + /> + <ensemble + asset_num="36" + xui_name="undershirt" + icon_name="inv_folder_outfit_undershirt.tga" + /> +</ensemble_defs> |