diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2011-05-09 11:26:24 -0700 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2011-05-09 11:26:24 -0700 |
| commit | 2661a4c2c9359f2c2cabce6f48704dc8fb481994 (patch) | |
| tree | d6fafbb1a084ea8b06db3d3499bd5084b7e4f7f6 /indra/newview/llsidetray.h | |
| parent | 26334a4c57e58bfd13e6bbbff2298ec5ba3e77e7 (diff) | |
| parent | a5118ccd6721afdf4f8c71cba6007eb7be4d7c19 (diff) | |
Merge.
Diffstat (limited to 'indra/newview/llsidetray.h')
| -rw-r--r-- | indra/newview/llsidetray.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llsidetray.h b/indra/newview/llsidetray.h index 46765bfbcc..24882411f4 100644 --- a/indra/newview/llsidetray.h +++ b/indra/newview/llsidetray.h @@ -121,7 +121,7 @@ public: LLPanel* getActivePanel (); bool isPanelActive (const std::string& panel_name); - void setTabDocked(const std::string& tab_name, bool dock); + void setTabDocked(const std::string& tab_name, bool dock, bool toggle_floater = true); /* * get the panel of given type T (don't show it or do anything else with it) |