diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-01 09:32:08 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-01 09:32:08 -0400 |
| commit | e23eeb7ed20055e1a95ea87e0014ba141f4ab0bb (patch) | |
| tree | 121a9ac847173773cccc0660ebe54ffeb44491b3 /indra/newview/llsidetray.cpp | |
| parent | e0ca936fbf7411bcc1cdd935a50c5913db6a1cb9 (diff) | |
| parent | 9698314736252b248921bb3a3459f2bdf539ffba (diff) | |
merge changes for storm-1072
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()); |