diff options
author | Jacek Antonelli | 2008-08-15 23:45:34 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:34 -0500 |
commit | cd17687f01420952712a500107e0f93e7ab8d5f8 (patch) | |
tree | ce48c2b706f2c1176290e39fb555fbdf6648ce01 /linden/indra/newview/llwearablelist.cpp | |
parent | Second Life viewer sources 1.19.0.5 (diff) | |
download | meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.zip meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.gz meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.bz2 meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.xz |
Second Life viewer sources 1.19.1.0
Diffstat (limited to 'linden/indra/newview/llwearablelist.cpp')
-rw-r--r-- | linden/indra/newview/llwearablelist.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/linden/indra/newview/llwearablelist.cpp b/linden/indra/newview/llwearablelist.cpp index e1dabea..22b8142 100644 --- a/linden/indra/newview/llwearablelist.cpp +++ b/linden/indra/newview/llwearablelist.cpp | |||
@@ -73,13 +73,14 @@ struct LLWearableArrivedData | |||
73 | 73 | ||
74 | LLWearableList::~LLWearableList() | 74 | LLWearableList::~LLWearableList() |
75 | { | 75 | { |
76 | mList.deleteAllData(); | 76 | for_each(mList.begin(), mList.end(), DeletePairedPointer()); |
77 | mList.clear(); | ||
77 | } | 78 | } |
78 | 79 | ||
79 | void LLWearableList::getAsset( const LLAssetID& assetID, const LLString& wearable_name, LLAssetType::EType asset_type, void(*asset_arrived_callback)(LLWearable*, void* userdata), void* userdata ) | 80 | void LLWearableList::getAsset( const LLAssetID& assetID, const LLString& wearable_name, LLAssetType::EType asset_type, void(*asset_arrived_callback)(LLWearable*, void* userdata), void* userdata ) |
80 | { | 81 | { |
81 | llassert( (asset_type == LLAssetType::AT_CLOTHING) || (asset_type == LLAssetType::AT_BODYPART) ); | 82 | llassert( (asset_type == LLAssetType::AT_CLOTHING) || (asset_type == LLAssetType::AT_BODYPART) ); |
82 | LLWearable* instance = mList.getIfThere( assetID ); | 83 | LLWearable* instance = get_if_there(mList, assetID, (LLWearable*)NULL ); |
83 | if( instance ) | 84 | if( instance ) |
84 | { | 85 | { |
85 | asset_arrived_callback( instance, userdata ); | 86 | asset_arrived_callback( instance, userdata ); |