diff options
author | Oz Linden <oz@lindenlab.com> | 2014-08-13 17:58:01 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2014-08-13 17:58:01 -0400 |
commit | 383edf8015743becc37650ab018a112b9ff347b1 (patch) | |
tree | 1e9a33f1517c6fff3416f5426de525628f1d29c2 /indra/newview/llfloatersidepanelcontainer.h | |
parent | d56958e68934e673195ec2966e0a3c20dac7fb41 (diff) | |
parent | 06b605b8666f2336e77126f8ff47765115c08a27 (diff) |
merge changes for MAINT-4356
Diffstat (limited to 'indra/newview/llfloatersidepanelcontainer.h')
-rwxr-xr-x | indra/newview/llfloatersidepanelcontainer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloatersidepanelcontainer.h b/indra/newview/llfloatersidepanelcontainer.h index 13b17e8867..d7ecd52e57 100755 --- a/indra/newview/llfloatersidepanelcontainer.h +++ b/indra/newview/llfloatersidepanelcontainer.h @@ -51,7 +51,7 @@ public: /*virtual*/ void onOpen(const LLSD& key); - /*virtual*/ void onClickCloseBtn(bool app_quitting = false); + /*virtual*/ void closeFloater(bool app_quitting = false); LLPanel* openChildPanel(const std::string& panel_name, const LLSD& params); |