diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-29 19:22:26 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-29 19:22:26 -0400 |
| commit | b595bbcf2af03b2a285c2df450379b670bddbfbc (patch) | |
| tree | 121ab3e96f6e72d53c5a4f84d761f13e1996bbda /indra/newview/llsidetray.cpp | |
| parent | fbd241da54ad6017825b59c5b0c71086d8b8957a (diff) | |
| parent | 7cb4f2d87dc8619d8ad86cb82f6687f1a9821a69 (diff) | |
merge changes for storm-1019
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()); |