diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-29 19:21:41 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-29 19:21:41 -0400 |
| commit | 7cb4f2d87dc8619d8ad86cb82f6687f1a9821a69 (patch) | |
| tree | 76eb80864288acd35fa7b0892a5aba96c13a860c /indra/newview/llsidetray.cpp | |
| parent | 39d83cb74f5978e926ff02dcb20a64802429bc69 (diff) | |
| parent | 9c0757511ec4ed12b47c6d3fd2ef20fca6828a6e (diff) | |
merge changes for storm-1086
Diffstat (limited to 'indra/newview/llsidetray.cpp')
| -rw-r--r-- | indra/newview/llsidetray.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llsidetray.cpp b/indra/newview/llsidetray.cpp index a9bb01ac70..fcd200d24a 100644 --- a/indra/newview/llsidetray.cpp +++ b/indra/newview/llsidetray.cpp @@ -686,7 +686,7 @@ LLPanel* LLSideTray::openChildPanel(LLSideTrayTab* tab, const std::string& panel LLFloater* floater_tab = LLFloaterReg::getInstance("side_bar_tab", tab_name); if (!floater_tab) return NULL; - floater_tab->openFloater(panel_name); + floater_tab->openFloater(tab_name); } LLSideTrayPanelContainer* container = dynamic_cast<LLSideTrayPanelContainer*>(view->getParent()); |