diff options
| author | skolb <none@none> | 2009-10-23 15:34:15 -0700 |
|---|---|---|
| committer | skolb <none@none> | 2009-10-23 15:34:15 -0700 |
| commit | 2b69cb9e9cf5209a8156580b74e6662e4cc4243f (patch) | |
| tree | f38805b6ca5b60e8c0130259865dc610eaee7a0b /indra/newview/llwearablelist.cpp | |
| parent | 913786a62b2b8d8e6d9c483ea805a21e694fd818 (diff) | |
| parent | 4ddaa866dde7a92e56617a32464e0667de3759ef (diff) | |
Merged change to auto play pref (DEV-41787)
Diffstat (limited to 'indra/newview/llwearablelist.cpp')
| -rw-r--r-- | indra/newview/llwearablelist.cpp | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/indra/newview/llwearablelist.cpp b/indra/newview/llwearablelist.cpp index 0257329dc1..da62223aac 100644 --- a/indra/newview/llwearablelist.cpp +++ b/indra/newview/llwearablelist.cpp @@ -74,21 +74,8 @@ LLWearableList::~LLWearableList() mList.clear(); } -void LLWearableList::getAsset(const LLAssetID& _assetID, const std::string& wearable_name, LLAssetType::EType asset_type, void(*asset_arrived_callback)(LLWearable*, void* userdata), void* userdata) +void LLWearableList::getAsset(const LLAssetID& assetID, const std::string& wearable_name, LLAssetType::EType asset_type, void(*asset_arrived_callback)(LLWearable*, void* userdata), void* userdata) { - LLAssetID assetID = _assetID; - - // A bit of a hack since wearables database doesn't contain asset types... - // Perform indirection in case this assetID is in fact a link. This only works - // because of the assumption that all assetIDs and itemIDs are unique (i.e. - // no assetID is also used as an itemID elsewhere); therefore if the assetID - // exists as an itemID in the user's inventory, then this must be a link. - const LLInventoryItem *linked_item = gInventory.getItem(_assetID); - if (linked_item) - { - assetID = linked_item->getAssetUUID(); - asset_type = linked_item->getType(); - } llassert( (asset_type == LLAssetType::AT_CLOTHING) || (asset_type == LLAssetType::AT_BODYPART) ); LLWearable* instance = get_if_there(mList, assetID, (LLWearable*)NULL ); if( instance ) |