summaryrefslogtreecommitdiff
path: root/indra/newview/llsidepanelappearance.cpp
diff options
context:
space:
mode:
authorYuri Chebotarev <ychebotarev@productengine.com>2010-04-06 11:54:32 +0300
committerYuri Chebotarev <ychebotarev@productengine.com>2010-04-06 11:54:32 +0300
commit3da3ed2ccb9bab68be113bf7a79e6f95f7b73f9e (patch)
tree76bf2106cbbed09e02340b9cb0fa2fdee422b725 /indra/newview/llsidepanelappearance.cpp
parent9dcdbf029c3a74de5aefca52262d4ed41626298d (diff)
parentcf94709c60949d5376f8c5dc14bf5472631cd6c9 (diff)
merge
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llsidepanelappearance.cpp')
-rw-r--r--indra/newview/llsidepanelappearance.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llsidepanelappearance.cpp b/indra/newview/llsidepanelappearance.cpp
index b951434010..308034225b 100644
--- a/indra/newview/llsidepanelappearance.cpp
+++ b/indra/newview/llsidepanelappearance.cpp
@@ -182,11 +182,9 @@ void LLSidepanelAppearance::onOpen(const LLSD& key)
mLookInfoType = key["type"].asString();
- if (mLookInfoType == "look")
+ if (mLookInfoType == "edit_outfit")
{
- LLInventoryCategory *pLook = gInventory.getCategory(key["id"].asUUID());
- if (pLook)
- mOutfitEdit->displayLookInfo(pLook);
+ mOutfitEdit->displayCurrentOutfit();
}
}
@@ -297,6 +295,8 @@ void LLSidepanelAppearance::toggleWearableEditPanel(BOOL visible, LLWearable *we
return;
}
+ mCurrOutfitPanel->setVisible(!visible);
+
mEditWearable->setVisible(visible);
mEditWearable->setWearable(wearable);
mFilterEditor->setVisible(!visible);