summaryrefslogtreecommitdiff
path: root/indra/newview/llappearancemgr.h
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2009-11-12 16:03:59 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2009-11-12 16:03:59 -0500
commit315af3fb82574698078dce00236e2778d6ce9730 (patch)
treedcc59e6db7d43fb845baef97342f5f14b1d84ed1 /indra/newview/llappearancemgr.h
parent0b104e2a418dc794ce7230ab30f472d1787cd9c4 (diff)
LLAppearanceManager cleanup - no static at all
--HG-- branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llappearancemgr.h')
-rw-r--r--indra/newview/llappearancemgr.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/indra/newview/llappearancemgr.h b/indra/newview/llappearancemgr.h
index b0ecb2e23e..4401596e2c 100644
--- a/indra/newview/llappearancemgr.h
+++ b/indra/newview/llappearancemgr.h
@@ -55,6 +55,7 @@ public:
void wearOutfitByName(const std::string& name);
void shallowCopyCategory(const LLUUID& src_id, const LLUUID& dst_id,
LLPointer<LLInventoryCallback> cb);
+ void changeOutfit(bool proceed, const LLUUID& category, bool append);
// Add COF link to individual item.
void wearItem(LLInventoryItem* item, bool do_update = true);
@@ -73,6 +74,7 @@ public:
void registerAttachment(const LLUUID& item_id);
void setAttachmentInvLinkEnable(bool val);
void linkRegisteredAttachments();
+ void updateAgentWearables(LLWearableHoldingPattern* holder, bool append);
protected:
LLAppearanceManager();
@@ -98,7 +100,6 @@ private:
LLInventoryModel::item_array_t& obj_items,
LLInventoryModel::item_array_t& gest_items,
bool follow_folder_links);
- void updateAgentWearables(LLWearableHoldingPattern* holder, bool append);
bool isMandatoryWearableType(EWearableType type);
void checkMandatoryWearableTypes(const LLUUID& category, std::set<EWearableType>& types_found);
void purgeCOFBeforeRebuild(const LLUUID& category);
@@ -106,10 +107,6 @@ private:
std::set<LLUUID> mRegisteredAttachments;
bool mAttachmentInvLinkEnabled;
-
- // Static callbacks
- static void onWearableAssetFetch(LLWearable* wearable, void* data);
- static void changeOutfit(bool proceed, const LLUUID& category, bool append);
};
#define SUPPORT_ENSEMBLES 0