diff options
| author | Andrew A. de Laix <alain@lindenlab.com> | 2010-07-01 09:30:48 -0700 |
|---|---|---|
| committer | Andrew A. de Laix <alain@lindenlab.com> | 2010-07-01 09:30:48 -0700 |
| commit | 55176768998fab1a6b9b5b25910d9d7fa8a16298 (patch) | |
| tree | 56dcfedd83aa2911a1c5aadb38820dafaca55111 /indra/newview/llappearancemgr.h | |
| parent | 8d6fec5cc10f11a7de0c749ca700d6d1b5a4099a (diff) | |
| parent | a94223b3dfb7e2a12e6ab850aac096f1d8301ad3 (diff) | |
Merge 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 |