diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-29 19:32:41 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-29 19:32:41 -0400 |
| commit | f633aef1af5a1a695df655080d3a20c033a31e18 (patch) | |
| tree | 28776800d7039476587adfe91d92ec5f515c652f /indra/newview/llsidetray.cpp | |
| parent | 6418ccc9e5a03d32778c8588139fe939a969838a (diff) | |
| parent | b595bbcf2af03b2a285c2df450379b670bddbfbc (diff) | |
Automated merge with file:///Users/oz/Work/V-D
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()); |