summaryrefslogtreecommitdiff
path: root/indra/newview/llsidetraypanelcontainer.cpp
diff options
context:
space:
mode:
authorLeslie Linden <leslie@lindenlab.com>2011-11-14 11:29:02 -0800
committerLeslie Linden <leslie@lindenlab.com>2011-11-14 11:29:02 -0800
commit2f55effd25c035c2af80bd5e6754c96a18f9d7e0 (patch)
tree02d2c153b4e40b9770521ee64fb45fd7176b082c /indra/newview/llsidetraypanelcontainer.cpp
parent7a31a48536f8a373b4e857ca8b906a6984530a04 (diff)
parentd8e1b48328017eba1c68bcc56a4f67085643988a (diff)
Merge
Diffstat (limited to 'indra/newview/llsidetraypanelcontainer.cpp')
-rw-r--r--indra/newview/llsidetraypanelcontainer.cpp7
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())