summaryrefslogtreecommitdiff
path: root/indra/newview/llsidepanelappearance.cpp
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2010-08-02 19:46:42 +0300
committerVadim Savchuk <vsavchuk@productengine.com>2010-08-02 19:46:42 +0300
commit4104ba0a3d7aabbec3bb0df1ce233bee4a22496a (patch)
tree2189b853f4dfe99435048241bda6c3959b31f695 /indra/newview/llsidepanelappearance.cpp
parent9fcfa8277b5ab6177a5ed54418c545776dea2fc5 (diff)
parent5b7031dd83bea0f3201fd45d55ef896227f399ce (diff)
Manual merge from default branch. Resolved conflicts in indra/newview/llfloatercamera.cpp.
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llsidepanelappearance.cpp')
-rw-r--r--indra/newview/llsidepanelappearance.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llsidepanelappearance.cpp b/indra/newview/llsidepanelappearance.cpp
index 98cd0b88eb..adfd457664 100644
--- a/indra/newview/llsidepanelappearance.cpp
+++ b/indra/newview/llsidepanelappearance.cpp
@@ -501,8 +501,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)
{