diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-02 16:26:43 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-02 16:26:43 +0300 |
| commit | 15561d0d540df27426c0cae1837ac42c3cb83a56 (patch) | |
| tree | 0ca49f2c9abfe11f892d76de95e41fbb1eb390ea /indra/newview/llappearancemgr.h | |
| parent | 5285a7fa7ec67c2337c5f071e6785b143e24c9a6 (diff) | |
| parent | 4ffcfe0a5fe21dcb49d79851eb43bd5d80623e0d (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llappearancemgr.h')
| -rw-r--r-- | indra/newview/llappearancemgr.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llappearancemgr.h b/indra/newview/llappearancemgr.h index 61779d5c0e..afd1bf3ade 100644 --- a/indra/newview/llappearancemgr.h +++ b/indra/newview/llappearancemgr.h @@ -66,6 +66,7 @@ public: void renameOutfit(const LLUUID& outfit_id); void takeOffOutfit(const LLUUID& cat_id); void addCategoryToCurrentOutfit(const LLUUID& cat_id); + void enforceItemCountLimits(); // Copy all items and the src category itself. void shallowCopyCategory(const LLUUID& src_id, const LLUUID& dst_id, @@ -203,6 +204,7 @@ private: std::set<LLUUID> mRegisteredAttachments; bool mAttachmentInvLinkEnabled; bool mOutfitIsDirty; + bool mIsInUpdateAppearanceFromCOF; // to detect recursive calls. /** * Lock for blocking operations on outfit until server reply or timeout exceed |