diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-18 10:58:18 +0100 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-18 10:58:18 +0100 |
commit | cd0ab5b41eda85b9cb4855f61c3f7e4ca5150797 (patch) | |
tree | 6e580ae150bc6942b393ad4bb73213c9f81fe909 /indra/newview/llsidetray.h | |
parent | 8b7563660c1d2ee7463edd24116a327b3b6553c3 (diff) | |
parent | b6ed10e8285e4abef4f14c618186984ef4b2cf7f (diff) |
merge from viewer-public
Diffstat (limited to 'indra/newview/llsidetray.h')
-rw-r--r-- | indra/newview/llsidetray.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llsidetray.h b/indra/newview/llsidetray.h index 140a9c818a..e8fdee9430 100644 --- a/indra/newview/llsidetray.h +++ b/indra/newview/llsidetray.h @@ -94,7 +94,7 @@ public: * if no such tab - return NULL, otherwise a pointer to the panel * Pass params as array, or they may be overwritten(example - params["name"]="nearby") */ - LLPanel* showPanel (const std::string& panel_name, const LLSD& params); + LLPanel* showPanel (const std::string& panel_name, const LLSD& params = LLSD()); /** * Toggling Side Tray tab which contains "sub_panel" child of "panel_name" panel. @@ -102,7 +102,7 @@ public: * otherwise Side Tray is collapsed. * params are passed to "panel_name" panel onOpen(). */ - void togglePanel (LLPanel* &sub_panel, const std::string& panel_name, const LLSD& params); + void togglePanel (LLPanel* &sub_panel, const std::string& panel_name, const LLSD& params = LLSD()); /* * get the panel (don't show it or do anything else with it) |