diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-03-31 16:40:57 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-03-31 16:40:57 -0400 |
| commit | 8ccf3fbe3ba49c47da85527bcf6cdbded6fa9183 (patch) | |
| tree | edddbe8910b253d803d754ef0a87c95b74ba3adc /indra/newview/llsidetray.cpp | |
| parent | 3a08499572250b46d061106298e2d2777276efc1 (diff) | |
| parent | 5c3ae68299f79f3a705fa4b3e9cd262b56695318 (diff) | |
Automated merge up from viewer-development into mesh-development
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()); |