diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-04 15:26:56 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-04 15:26:56 -0400 |
| commit | 94aa24a89ee96689633fad4e7250f6f81b6b76c1 (patch) | |
| tree | 58eaa9b1e6af1eea6aedffe51d758f177217f172 /indra/newview/llsidetray.cpp | |
| parent | 1a2cc89cc59d92e768e109a1a822bfedfd9aaf01 (diff) | |
| parent | e952f77a505cf274ca0b3ea95b504a51e757806a (diff) | |
merge changes for social-859
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()); |