diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-08-16 15:35:40 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-08-16 15:35:40 +0300 |
| commit | 462b629be51be9d9d13e7731403930a825e9d20e (patch) | |
| tree | 356fe5d1018fb4b2ea5e8ed768b079d58cae59e4 /indra/newview/llsidepanelappearance.cpp | |
| parent | 6b53458b8477e542ddc5cc1f9fb41cc4a98819b1 (diff) | |
| parent | 635b3edaaf83032d6240212d065ec65753e6c58c (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llsidepanelappearance.cpp')
| -rw-r--r-- | indra/newview/llsidepanelappearance.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llsidepanelappearance.cpp b/indra/newview/llsidepanelappearance.cpp index adfd457664..83329ebccf 100644 --- a/indra/newview/llsidepanelappearance.cpp +++ b/indra/newview/llsidepanelappearance.cpp @@ -473,7 +473,7 @@ void LLSidepanelAppearance::fetchInventory() { LLViewerObject* attached_object = (*attachment_iter); if (!attached_object) continue; - const LLUUID& item_id = attached_object->getItemID(); + const LLUUID& item_id = attached_object->getAttachmentItemID(); if (item_id.isNull()) continue; ids.push_back(item_id); } @@ -501,8 +501,8 @@ void LLSidepanelAppearance::inventoryFetched() void LLSidepanelAppearance::setWearablesLoading(bool val) { - getChildView("wearables_loading_indicator")->setVisible( val); - getChildView("edit_outfit_btn")->setVisible( !val); + childSetVisible("wearables_loading_indicator", val); + childSetVisible("edit_outfit_btn", !val); if (!val) { |
