diff options
author | Chris Baker <baker@lindenlab.com> | 2014-06-16 21:15:41 +0000 |
---|---|---|
committer | Chris Baker <baker@lindenlab.com> | 2014-06-16 21:15:41 +0000 |
commit | ee14005a2aea89b2988fa0a5060f38b669e45389 (patch) | |
tree | 3b9930089be344a9c25172f3ca4be0fbf412ba17 /indra/newview/llsidepanelappearance.cpp | |
parent | a92dbb592b338f48f7b75b68a9da511dc95279f9 (diff) | |
parent | 977476171ddcc057d7c28b6c14ae988b8189ed75 (diff) |
viewer-release merge
Diffstat (limited to 'indra/newview/llsidepanelappearance.cpp')
-rwxr-xr-x | 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 c938a478f7..64f24cd291 100755 --- a/indra/newview/llsidepanelappearance.cpp +++ b/indra/newview/llsidepanelappearance.cpp @@ -452,7 +452,7 @@ void LLSidepanelAppearance::editWearable(LLViewerWearable *wearable, LLView *dat LLFloaterSidePanelContainer::showPanel("appearance", LLSD()); LLSidepanelAppearance *panel = dynamic_cast<LLSidepanelAppearance*>(data); if (panel) - { + { panel->showWearableEditPanel(wearable, disable_camera_switch); } } |