From 850c0f1e33ed5188b5346a7aeb3099ca29e0d2d0 Mon Sep 17 00:00:00 2001 From: Eric Tulla Date: Fri, 16 Oct 2009 20:11:51 +0000 Subject: Merge of latest avatar pipeline working branch into viewer2.0 branch. Result of: (NO CONFLICTS) svn merge -r 135985:136503 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-11 . --- indra/newview/llappearancemgr.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'indra/newview/llappearancemgr.h') diff --git a/indra/newview/llappearancemgr.h b/indra/newview/llappearancemgr.h index fe24696182..928b5f2bcd 100644 --- a/indra/newview/llappearancemgr.h +++ b/indra/newview/llappearancemgr.h @@ -78,6 +78,11 @@ private: bool follow_folder_links); static void onWearableAssetFetch(LLWearable* wearable, void* data); static void updateAgentWearables(LLWearableHoldingPattern* holder, bool append); + static bool isMandatoryWearableType(EWearableType type); + static void checkMandatoryWearableTypes(const LLUUID& category, std::set& types_found); + static void purgeCOFBeforeRebuild(const LLUUID& category); }; +#define SUPPORT_ENSEMBLES 0 + #endif -- cgit v1.2.3