From 51010803dfe8e2ee37f6fa4ac074c8f9380a43c8 Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Wed, 10 Mar 2010 16:38:00 -0500 Subject: First draft of changes for avatar outfit panel, so PE can start working on it. Demo code, will get cleaned up / extended through future work on the project - just need to check it in to collaborate. --- indra/newview/llagentwearables.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llagentwearables.h') diff --git a/indra/newview/llagentwearables.h b/indra/newview/llagentwearables.h index 858540a5f5..a6b73997a6 100644 --- a/indra/newview/llagentwearables.h +++ b/indra/newview/llagentwearables.h @@ -89,7 +89,7 @@ public: const LLUUID getWearableItemID(EWearableType type, U32 index /*= 0*/) const; const LLUUID getWearableAssetID(EWearableType type, U32 index /*= 0*/) const; const LLWearable* getWearableFromItemID(const LLUUID& item_id) const; - const LLWearable* getWearableFromAssetID(const LLUUID& asset_id) const; + LLWearable* getWearableFromAssetID(const LLUUID& asset_id); LLInventoryItem* getWearableInventoryItem(EWearableType type, U32 index /*= 0*/); // MULTI-WEARABLE: assuming one per type. static BOOL selfHasWearable(EWearableType type); -- cgit v1.2.3 From 853d9e44534f568d4a17033c7b8ecbafddf7bd69 Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Thu, 25 Mar 2010 17:27:50 -0400 Subject: EXT-6539 : Take out mAvatarObject from LLAgentWearables Removed mAvatarObject / gAgentWearables.mAvatarObject since it's redundant with gAgent.mAvatarObject. --- indra/newview/llagentwearables.h | 1 - 1 file changed, 1 deletion(-) (limited to 'indra/newview/llagentwearables.h') diff --git a/indra/newview/llagentwearables.h b/indra/newview/llagentwearables.h index a6b73997a6..652ffd4587 100644 --- a/indra/newview/llagentwearables.h +++ b/indra/newview/llagentwearables.h @@ -218,7 +218,6 @@ private: static BOOL mInitialWearablesUpdateReceived; BOOL mWearablesLoaded; std::set mItemsAwaitingWearableUpdate; - LLPointer mAvatarObject; // NULL until avatar object sent down from simulator //-------------------------------------------------------------------------------- // Support classes -- cgit v1.2.3