diff options
author | Dave Parks <davep@lindenlab.com> | 2012-11-20 17:03:55 -0600 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2012-11-20 17:03:55 -0600 |
commit | 5d34ac552f3939626840b703b2da380663f25f49 (patch) | |
tree | ddeacd3365fed0ad193c053d39ebeb39451cc74a /indra/newview/llsidepanelappearance.cpp | |
parent | a830812172d7eb163c06ead3155dc4b43ded4346 (diff) | |
parent | 8db983fb8095f25873b8317fd1f4764abce4a31b (diff) |
Automated merge with https://bitbucket.org/lindenlab/viewer-development
Diffstat (limited to 'indra/newview/llsidepanelappearance.cpp')
-rw-r--r-- | indra/newview/llsidepanelappearance.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llsidepanelappearance.cpp b/indra/newview/llsidepanelappearance.cpp index 853656905c..d909a218e3 100644 --- a/indra/newview/llsidepanelappearance.cpp +++ b/indra/newview/llsidepanelappearance.cpp @@ -456,10 +456,10 @@ void LLSidepanelAppearance::refreshCurrentOutfitName(const std::string& name) void LLSidepanelAppearance::editWearable(LLWearable *wearable, LLView *data, BOOL disable_camera_switch) { LLFloaterSidePanelContainer::showPanel("appearance", LLSD()); - LLSidepanelAppearance *panel = dynamic_cast<LLSidepanelAppearance*>(data); if (panel) { + panel->showOutfitsInventoryPanel(); panel->showWearableEditPanel(wearable, disable_camera_switch); } } |