diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-08-16 15:35:40 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-08-16 15:35:40 +0300 |
| commit | 462b629be51be9d9d13e7731403930a825e9d20e (patch) | |
| tree | 356fe5d1018fb4b2ea5e8ed768b079d58cae59e4 /indra/newview/llappearancemgr.h | |
| parent | 6b53458b8477e542ddc5cc1f9fb41cc4a98819b1 (diff) | |
| parent | 635b3edaaf83032d6240212d065ec65753e6c58c (diff) | |
Merge from default branch
--HG--
branch : product-engine
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 eb495bd274..67c74e0343 100644 --- a/indra/newview/llappearancemgr.h +++ b/indra/newview/llappearancemgr.h @@ -66,7 +66,11 @@ public: void renameOutfit(const LLUUID& outfit_id); void takeOffOutfit(const LLUUID& cat_id); void addCategoryToCurrentOutfit(const LLUUID& cat_id); - void enforceItemCountLimits(); + S32 findExcessOrDuplicateItems(const LLUUID& cat_id, + LLAssetType::EType type, + S32 max_items, + LLInventoryModel::item_array_t& items_to_kill); + void enforceItemRestrictions(); // Copy all items and the src category itself. void shallowCopyCategory(const LLUUID& src_id, const LLUUID& dst_id, @@ -119,7 +123,6 @@ public: void unregisterAttachment(const LLUUID& item_id); void registerAttachment(const LLUUID& item_id); void setAttachmentInvLinkEnable(bool val); - void linkRegisteredAttachments(); // utility function for bulk linking. void linkAll(const LLUUID& category, @@ -206,7 +209,6 @@ private: void setOutfitLocked(bool locked); - std::set<LLUUID> mRegisteredAttachments; bool mAttachmentInvLinkEnabled; bool mOutfitIsDirty; bool mIsInUpdateAppearanceFromCOF; // to detect recursive calls. |