diff options
author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-09-15 23:21:15 +0300 |
---|---|---|
committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-09-15 23:21:15 +0300 |
commit | c2b6620572056d4de372ccd77602c39afd2500c6 (patch) | |
tree | f396b0750c7b85560db1202438e23dc2cf101d56 /indra/newview/llappearancemgr.h | |
parent | da23e0f925742045013fc09e75b962c65e1cda88 (diff) | |
parent | 51bb369a39142ff5049f753099f9638ce68b95dc (diff) |
Merged in lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llappearancemgr.h')
-rw-r--r-- | indra/newview/llappearancemgr.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llappearancemgr.h b/indra/newview/llappearancemgr.h index 07ae5fba86..f0d3f80f59 100644 --- a/indra/newview/llappearancemgr.h +++ b/indra/newview/llappearancemgr.h @@ -61,6 +61,7 @@ public: void changeOutfit(bool proceed, const LLUUID& category, bool append); void replaceCurrentOutfit(const LLUUID& new_outfit); void renameOutfit(const LLUUID& outfit_id); + void removeOutfitPhoto(const LLUUID& outfit_id); void takeOffOutfit(const LLUUID& cat_id); void addCategoryToCurrentOutfit(const LLUUID& cat_id); S32 findExcessOrDuplicateItems(const LLUUID& cat_id, @@ -184,6 +185,9 @@ public: void wearBaseOutfit(); + void setOutfitImage(const LLUUID& image_id) {mCOFImageID = image_id;} + LLUUID getOutfitImage() {return mCOFImageID;} + // Overrides the base outfit with the content from COF // @return false if there is no base outfit bool updateBaseOutfit(); @@ -273,6 +277,8 @@ private: static bool mActive; attachments_changed_signal_t mAttachmentsChangeSignal; + + LLUUID mCOFImageID; std::auto_ptr<LLOutfitUnLockTimer> mUnlockOutfitTimer; |