diff options
| author | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2010-04-29 11:05:09 +0300 |
|---|---|---|
| committer | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2010-04-29 11:05:09 +0300 |
| commit | 2703de333a7dd59a1fe7df045299bfbfd06af807 (patch) | |
| tree | 19d2805be4a357c79947a9a9b1cfe4976988aa1e /indra | |
| parent | e1cf84c9b670e764d39c4152df3ed8c705732735 (diff) | |
Manual merge
--HG--
branch : product-engine
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llcofwearables.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llcofwearables.cpp b/indra/newview/llcofwearables.cpp index 88ba6c10df..a2a1dd504a 100644 --- a/indra/newview/llcofwearables.cpp +++ b/indra/newview/llcofwearables.cpp @@ -118,7 +118,7 @@ void LLCOFWearables::populateAttachmentsAndBodypartsLists(const LLInventoryModel const LLAssetType::EType item_type = item->getType(); if (item_type == LLAssetType::AT_CLOTHING) continue; - LLPanelInventoryListItem* item_panel = NULL; + LLPanelInventoryListItemBase* item_panel = NULL; if (item_type == LLAssetType::AT_OBJECT) { item_panel = LLPanelInventoryListItemBase::create(item); @@ -165,7 +165,7 @@ void LLCOFWearables::populateClothingList(LLAppearanceMgr::wearables_by_type_t& { LLViewerInventoryItem* item = clothing_by_type[type][i]; - LLPanelInventoryListItem* item_panel = LLPanelClothingListItem::create(item); + LLPanelInventoryListItemBase* item_panel = LLPanelClothingListItem::create(item); if (!item_panel) continue; mClothing->addItem(item_panel, item->getUUID(), ADD_BOTTOM, false); |