diff options
| author | Richard Linden <none@none> | 2011-04-01 16:42:46 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-04-01 16:42:46 -0700 |
| commit | 88c5554a288d1785aa391dc5ff7b7897a7a724a9 (patch) | |
| tree | 0305d5ce1f0bb5e544cd75275a137b372a08293d /indra/newview/llsidetray.cpp | |
| parent | 774b9ac9f9f87af65a7356d7f9a25e204428d4aa (diff) | |
| parent | 453b0c700a8712f7ff79434772296a487d38184a (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-social-2
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()); |