diff options
| author | Graham Linden <graham@lindenlab.com> | 2013-09-26 11:45:07 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2013-09-26 11:45:07 -0700 |
| commit | 037cbf82310710a1ec8f0affd2bba24aa87d20b5 (patch) | |
| tree | 51eb135eaaff94a8ed119486d05e963c2cd8a676 /indra/llui/llfloater.cpp | |
| parent | 0103cac1ddda96fd470238d2c8b73c2cf55b6c12 (diff) | |
| parent | e285d515d5b94acce280edf586a16272931749d9 (diff) | |
Merge lion for good measure
Diffstat (limited to 'indra/llui/llfloater.cpp')
| -rwxr-xr-x | indra/llui/llfloater.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index 273ceb4038..03ad664928 100755 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -1802,7 +1802,7 @@ void LLFloater::onClickClose( LLFloater* self ) self->onClickCloseBtn(); } -void LLFloater::onClickCloseBtn() +void LLFloater::onClickCloseBtn(bool app_quitting) { closeFloater(false); } |