diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-03-08 10:10:59 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-03-08 10:10:59 -0500 |
| commit | a7f02a3e51f07c657a0acd31637f46f74b30daf7 (patch) | |
| tree | c572c162ee7bec027971ca7a64f74032938b20a8 /indra/newview/llfloatersidepanelcontainer.cpp | |
| parent | cce59647a99648af63c96168c36e85563da40a1a (diff) | |
| parent | 55b2383f51ffabf7e95595df5d576f383d458ee1 (diff) | |
merge changes for 3.5.0-beta2
Diffstat (limited to 'indra/newview/llfloatersidepanelcontainer.cpp')
| -rw-r--r-- | indra/newview/llfloatersidepanelcontainer.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/indra/newview/llfloatersidepanelcontainer.cpp b/indra/newview/llfloatersidepanelcontainer.cpp index 5385977d95..96b5c6b09b 100644 --- a/indra/newview/llfloatersidepanelcontainer.cpp +++ b/indra/newview/llfloatersidepanelcontainer.cpp @@ -61,7 +61,7 @@ LLPanel* LLFloaterSidePanelContainer::openChildPanel(const std::string& panel_na if (!getVisible()) { - openFloater(); + openFloater(); } LLPanel* panel = NULL; @@ -69,10 +69,7 @@ LLPanel* LLFloaterSidePanelContainer::openChildPanel(const std::string& panel_na LLSideTrayPanelContainer* container = dynamic_cast<LLSideTrayPanelContainer*>(view->getParent()); if (container) { - LLSD new_params = params; - new_params[LLSideTrayPanelContainer::PARAM_SUB_PANEL_NAME] = panel_name; - container->onOpen(new_params); - + container->openPanel(panel_name, params); panel = container->getCurrentPanel(); } else if ((panel = dynamic_cast<LLPanel*>(view)) != NULL) |