diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-11-08 15:06:43 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-11-08 15:06:43 -0500 |
| commit | 22dd6acbc969f604c120a9ca06cfbef6eb8d29a4 (patch) | |
| tree | 2d3b3f20149253ca275e5724a09b5bd691ff7db6 /indra/newview/llsidetraypanelcontainer.cpp | |
| parent | 281fde3c4809fb6c6715617f4269299b4afc7edc (diff) | |
| parent | 97a9ce15750e43773ca2a2c3b8aba952dbbc9721 (diff) | |
merge changes for storm-1580
Diffstat (limited to 'indra/newview/llsidetraypanelcontainer.cpp')
| -rw-r--r-- | indra/newview/llsidetraypanelcontainer.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llsidetraypanelcontainer.cpp b/indra/newview/llsidetraypanelcontainer.cpp index 95a12c7c23..e340333c2c 100644 --- a/indra/newview/llsidetraypanelcontainer.cpp +++ b/indra/newview/llsidetraypanelcontainer.cpp @@ -62,6 +62,13 @@ void LLSideTrayPanelContainer::onOpen(const LLSD& key) getCurrentPanel()->onOpen(key); } +void LLSideTrayPanelContainer::openPanel(const std::string& panel_name, const LLSD& key) +{ + LLSD combined_key = key; + combined_key[PARAM_SUB_PANEL_NAME] = panel_name; + onOpen(combined_key); +} + void LLSideTrayPanelContainer::openPreviousPanel() { if(!mDefaultPanelName.empty()) |