diff options
author | Dessie Linden <dessie@lindenlab.com> | 2010-07-01 07:03:09 -0700 |
---|---|---|
committer | Dessie Linden <dessie@lindenlab.com> | 2010-07-01 07:03:09 -0700 |
commit | 87a4890312c7bc5671d7d122e9d1f4ec1795d2dd (patch) | |
tree | 5d1c1617a60733defa424232e8bef15971b03b72 /indra/newview/llappearancemgr.h | |
parent | 070311d5ccc111e44775b12a95e8ccb9434cd147 (diff) | |
parent | af4a85009011119e7787e2b30416919117edccf9 (diff) |
Merged from viewer-release
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 |