diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-07-09 10:19:15 -0400 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-07-09 10:19:15 -0400 |
commit | d8f795aa9ceaae73ad8890a1110fa6b4045843c7 (patch) | |
tree | 96bd0bbc9d7bbe2a6a8d9a543fc581d82fdc1965 /indra/newview/llappearancemgr.h | |
parent | 9ae6672a15ae64dba1d2af774dcde26700fb6126 (diff) | |
parent | 467a8b0441e139773775ecf306f430f44814bff5 (diff) |
automated merge
Diffstat (limited to 'indra/newview/llappearancemgr.h')
-rw-r--r-- | indra/newview/llappearancemgr.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/llappearancemgr.h b/indra/newview/llappearancemgr.h index 8834f8c395..84c911c038 100644 --- a/indra/newview/llappearancemgr.h +++ b/indra/newview/llappearancemgr.h @@ -99,7 +99,7 @@ public: const LLUUID getBaseOutfitUUID(); // Wear/attach an item (from a user's inventory) on the agent - bool wearItemOnAvatar(const LLUUID& item_to_wear, bool do_update = true, bool replace = false); + bool wearItemOnAvatar(const LLUUID& item_to_wear, bool do_update = true, bool replace = false, LLPointer<LLInventoryCallback> cb = NULL); // Update the displayed outfit name in UI. void updatePanelOutfitName(const std::string& name); @@ -124,8 +124,8 @@ public: LLPointer<LLInventoryCallback> cb); // Add COF link to individual item. - void addCOFItemLink(const LLUUID& item_id, bool do_update = true); - void addCOFItemLink(const LLInventoryItem *item, bool do_update = true); + void addCOFItemLink(const LLUUID& item_id, bool do_update = true, LLPointer<LLInventoryCallback> cb = NULL); + void addCOFItemLink(const LLInventoryItem *item, bool do_update = true, LLPointer<LLInventoryCallback> cb = NULL); // Remove COF entries void removeCOFItemLinks(const LLUUID& item_id, bool do_update = true); @@ -175,6 +175,8 @@ public: bool isOutfitLocked() { return mOutfitLocked; } + bool isInUpdateAppearanceFromCOF() { return mIsInUpdateAppearanceFromCOF; } + protected: LLAppearanceMgr(); ~LLAppearanceMgr(); |