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/newview/llfasttimerview.cpp | |
parent | 0103cac1ddda96fd470238d2c8b73c2cf55b6c12 (diff) | |
parent | e285d515d5b94acce280edf586a16272931749d9 (diff) |
Merge lion for good measure
Diffstat (limited to 'indra/newview/llfasttimerview.cpp')
-rwxr-xr-x | indra/newview/llfasttimerview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfasttimerview.cpp b/indra/newview/llfasttimerview.cpp index 8e1a1df211..06119620de 100755 --- a/indra/newview/llfasttimerview.cpp +++ b/indra/newview/llfasttimerview.cpp @@ -1545,7 +1545,7 @@ void LLFastTimerView::doAnalysis(std::string baseline, std::string target, std:: return ; } } -void LLFastTimerView::onClickCloseBtn() +void LLFastTimerView::onClickCloseBtn(bool) { setVisible(false); } |