diff options
| author | Bradley Payne <vir@lindenlab.com> | 2009-09-24 18:05:38 +0000 |
|---|---|---|
| committer | Bradley Payne <vir@lindenlab.com> | 2009-09-24 18:05:38 +0000 |
| commit | 7eca974a11cba4c4ed0bc89bccb937b044770c29 (patch) | |
| tree | e655f479d446715e921731180b37d01be426483b /indra/newview/llappearancemgr.h | |
| parent | 7b2737e0e14f815e69da7114dda693cdaea2c341 (diff) | |
Merging down avatar-pipeline/currently-worn-folder-8. Includes fixes for EXT-1121: Attaching / detaching objects doesn't affect the Current Outfit folder, and EXT-1090: Attachments detach on login, as well as work in progress for ensemble support and look details.
Diffstat (limited to 'indra/newview/llappearancemgr.h')
| -rw-r--r-- | indra/newview/llappearancemgr.h | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/indra/newview/llappearancemgr.h b/indra/newview/llappearancemgr.h index 89b95833d7..2aa10e0bea 100644 --- a/indra/newview/llappearancemgr.h +++ b/indra/newview/llappearancemgr.h @@ -35,6 +35,7 @@ #include "llsingleton.h" #include "llinventorymodel.h" +#include "llviewerinventory.h" class LLWearable; struct LLWearableHoldingPattern; @@ -44,20 +45,29 @@ class LLAppearanceManager: public LLSingleton<LLAppearanceManager> public: static void updateAppearanceFromCOF(); static bool needToSaveCOF(); - static void changeOutfit(bool proceed, const LLUUID& category, bool append, bool follow_folder_links); - static void updateCOFFromOutfit(const LLUUID& category, bool append, bool follow_folder_links); + static void changeOutfit(bool proceed, const LLUUID& category, bool append); + static void updateCOFFromCategory(const LLUUID& category, bool append); + static void rebuildCOFFromOutfit(const LLUUID& category); static void wearInventoryCategory(LLInventoryCategory* category, bool copy, bool append); static void wearInventoryCategoryOnAvatar(LLInventoryCategory* category, bool append); static void wearOutfitByName(const std::string& name); + static void shallowCopyCategory(const LLUUID& src_id, const LLUUID& dst_id, + LLPointer<LLInventoryCallback> cb); // Add COF link to individual item. static void wearItem(LLInventoryItem* item, bool do_update = true); // Add COF link to ensemble folder. static void wearEnsemble(LLInventoryCategory* item, bool do_update = true); + static LLUUID getCOF(); + + // Remove COF entries + static void removeItemLinks(LLUUID& item_id, bool do_update = true); private: - static LLUUID getCOF(); + static void getCOFValidDescendents(const LLUUID& category, + LLInventoryModel::item_array_t& items); + static void getUserDescendents(const LLUUID& category, LLInventoryModel::item_array_t& wear_items, LLInventoryModel::item_array_t& obj_items, |