diff options
| author | Paul ProductEngine <pguslisty@productengine.com> | 2011-09-28 17:14:50 +0300 |
|---|---|---|
| committer | Paul ProductEngine <pguslisty@productengine.com> | 2011-09-28 17:14:50 +0300 |
| commit | c44db34a15abd2e96b8fd461e9fb3e217fe648cc (patch) | |
| tree | 0f13e6caf34722040fa0fd3725126ae4a94269cb /indra/newview/llfloatersidepanelcontainer.h | |
| parent | 87db6c59ee2ac5f8cc304d6f8150af5f91e3fb8d (diff) | |
| parent | 8fd2d69fdf47e0f586c6010c589411e251967038 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llfloatersidepanelcontainer.h')
| -rw-r--r-- | indra/newview/llfloatersidepanelcontainer.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llfloatersidepanelcontainer.h b/indra/newview/llfloatersidepanelcontainer.h index b230500f56..10d85867ce 100644 --- a/indra/newview/llfloatersidepanelcontainer.h +++ b/indra/newview/llfloatersidepanelcontainer.h @@ -53,10 +53,12 @@ public: LLPanel* openChildPanel(const std::string& panel_name, const LLSD& params); - static void showPanel(const std::string& floater_name, const LLSD& panel_name); + static void showPanel(const std::string& floater_name, const LLSD& key); + static void showPanel(const std::string& floater_name, const std::string& panel_name, const LLSD& key); + static LLPanel* getPanel(const std::string& floater_name, const std::string& panel_name = sMainPanelName); - + /** * Gets the panel of given type T (doesn't show it or do anything else with it). * |