summaryrefslogtreecommitdiff
path: root/indra/newview/llsidetray.h
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-09-10 10:17:39 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-09-10 10:17:39 +0100
commit544ebaddf8e16f34fd6f44bcc2a8cdfca9a37074 (patch)
tree6297885e42efef9219282b22f40c20682f84444a /indra/newview/llsidetray.h
parent72e597a6f9e6dacbb41383ee8ee29e55acff4b74 (diff)
parent6b77ce904eedfa8bbcc9e2fd2d9f96e4f0093b95 (diff)
merge STORM-96 / STORM-92 (as part of vwr-20694).
Diffstat (limited to 'indra/newview/llsidetray.h')
-rw-r--r--indra/newview/llsidetray.h13
1 files changed, 9 insertions, 4 deletions
diff --git a/indra/newview/llsidetray.h b/indra/newview/llsidetray.h
index 248def8e3d..4e79007c13 100644
--- a/indra/newview/llsidetray.h
+++ b/indra/newview/llsidetray.h
@@ -76,9 +76,12 @@ public:
// interface functions
/**
- * Select tab with specific name and set it active
- */
- bool selectTabByName (const std::string& name);
+ * Select tab with specific name and set it active
+ *
+ * @param name Tab to switch to.
+ * @param keep_prev_visible Whether to keep the previously selected tab visible.
+ */
+ bool selectTabByName (const std::string& name, bool keep_prev_visible = false);
/**
* Select tab with specific index and set it active
@@ -119,8 +122,10 @@ public:
/*
* expand SideBar
+ *
+ * @param open_active Whether to call onOpen() for the active tab.
*/
- void expandSideBar ();
+ void expandSideBar(bool open_active = true);
/**