diff options
author | Merov Linden <merov@lindenlab.com> | 2010-08-26 21:45:20 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2010-08-26 21:45:20 -0700 |
commit | dbe965eaa1864ff71e365608488a5015172a24ed (patch) | |
tree | f3a7f10360a50a09ca1267fd204802507b079a17 /indra/newview/llsidepanelappearance.cpp | |
parent | 6ed18227535e1b76ae650efdacfb14c1a884fc1a (diff) | |
parent | 838c01e87d69a29f39554fbc5fa972ddd3baace1 (diff) |
Sync with viewer-development
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 fe7950c058..7206e4fcaf 100644 --- a/indra/newview/llsidepanelappearance.cpp +++ b/indra/newview/llsidepanelappearance.cpp @@ -468,7 +468,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); } @@ -496,8 +496,8 @@ void LLSidepanelAppearance::inventoryFetched() void LLSidepanelAppearance::setWearablesLoading(bool val) { - childSetVisible("wearables_loading_indicator", val); - childSetVisible("edit_outfit_btn", !val); + getChildView("wearables_loading_indicator")->setVisible( val); + getChildView("edit_outfit_btn")->setVisible( !val); if (!val) { |