diff options
| author | Eric Tulla <tulla@lindenlab.com> | 2009-10-16 20:11:51 +0000 |
|---|---|---|
| committer | Eric Tulla <tulla@lindenlab.com> | 2009-10-16 20:11:51 +0000 |
| commit | 850c0f1e33ed5188b5346a7aeb3099ca29e0d2d0 (patch) | |
| tree | 107b7c906cc689987f43c61c90fc74cd2cfe6306 /indra/newview/llappearancemgr.h | |
| parent | adaae9e082fb9200e2ea1c7cbc6e26cb5de35fa1 (diff) | |
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 .
Diffstat (limited to 'indra/newview/llappearancemgr.h')
| -rw-r--r-- | indra/newview/llappearancemgr.h | 5 |
1 files changed, 5 insertions, 0 deletions
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<EWearableType>& types_found); + static void purgeCOFBeforeRebuild(const LLUUID& category); }; +#define SUPPORT_ENSEMBLES 0 + #endif |