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/llviewerinventory.h | |
| 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/llviewerinventory.h')
| -rw-r--r-- | indra/newview/llviewerinventory.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewerinventory.h b/indra/newview/llviewerinventory.h index 0ee9b21d3a..10309d023b 100644 --- a/indra/newview/llviewerinventory.h +++ b/indra/newview/llviewerinventory.h @@ -206,7 +206,8 @@ public: // other than cacheing. bool exportFileLocal(LLFILE* fp) const; bool importFileLocal(LLFILE* fp); - + void determineFolderType(); + void changeType(LLAssetType::EType new_folder_type); protected: LLUUID mOwnerID; S32 mVersion; |