diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-11-03 12:53:40 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-11-03 12:53:40 -0500 |
| commit | 8f6b28d89f1b680db0c17cea680f1a184f298583 (patch) | |
| tree | 73d05fac4f1ae001261a4ecd9093a2e7de0592f8 /indra/newview/llappearancemgr.h | |
| parent | da3f4c402dd95e52186309af925b41ee946ef3dc (diff) | |
| parent | 9109809fb18968edfcd8e8f01428309fcc2e7578 (diff) | |
Automated merge with ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llappearancemgr.h')
| -rw-r--r-- | indra/newview/llappearancemgr.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llappearancemgr.h b/indra/newview/llappearancemgr.h index 45c6e23bae..56f54dfc23 100644 --- a/indra/newview/llappearancemgr.h +++ b/indra/newview/llappearancemgr.h @@ -70,7 +70,7 @@ public: static void dumpItemArray(const LLInventoryModel::item_array_t& items, const std::string& msg); static void unregisterAttachment(const LLUUID& item_id); static void registerAttachment(const LLUUID& item_id); - + static void setAttachmentInvLinkEnable(bool val); private: static void filterWearableItems(LLInventoryModel::item_array_t& items, S32 max_per_type); @@ -99,6 +99,7 @@ private: static void purgeCategory(const LLUUID& category, bool keep_outfit_links); static std::set<LLUUID> sRegisteredAttachments; + static bool sAttachmentInvLinkEnabled; }; |