diff options
author | Oz Linden <oz@lindenlab.com> | 2017-05-18 15:33:58 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2017-05-18 15:33:58 -0400 |
commit | 013f34ccdd1df275a02e6ca56f8f19b51413b35a (patch) | |
tree | e9a88852afc69ef7b4642cb9820e1c31772c1c40 /indra/newview/llfloatersnapshot.cpp | |
parent | ab3742a2a944ee8535e314ebfad52a980e079a70 (diff) | |
parent | 4bf1f1d618d61f0cc2ec0dd22cea7d1c5b909b8f (diff) |
merge latest updates from coyot
Diffstat (limited to 'indra/newview/llfloatersnapshot.cpp')
-rw-r--r-- | indra/newview/llfloatersnapshot.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp index c0980719bb..ba3106913c 100644 --- a/indra/newview/llfloatersnapshot.cpp +++ b/indra/newview/llfloatersnapshot.cpp @@ -653,10 +653,6 @@ void LLFloaterSnapshot::Impl::setFinished(bool finished, bool ok, const std::str LLUICtrl* finished_lbl = mFloater->getChild<LLUICtrl>(ok ? "succeeded_lbl" : "failed_lbl"); std::string result_text = mFloater->getString(msg + "_" + (ok ? "succeeded_str" : "failed_str")); finished_lbl->setValue(result_text); - - LLSideTrayPanelContainer* panel_container = mFloater->getChild<LLSideTrayPanelContainer>("panel_container"); - panel_container->openPreviousPanel(); - panel_container->getCurrentPanel()->onOpen(LLSD()); } } |