diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-12-12 15:51:43 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-12-12 15:51:43 -0500 |
| commit | dec487cd7f04f00d4aa6428d190ffbf978ea57da (patch) | |
| tree | d96cda0e2f03c1cf5b1f7ffcdd564690e0ab2cad /indra/llui/llfloater.cpp | |
| parent | c9775dde6249582f0e8976be15e72bfebc4ac3fc (diff) | |
| parent | 1a9b9f1bd1b5f64b35b9ce6eff458cdb7a79fe6e (diff) | |
merge changes for 3.6.12-release
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 182c5cfd8a..6e6bcd6ab5 100755 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -1821,7 +1821,7 @@ void LLFloater::onClickClose( LLFloater* self ) self->onClickCloseBtn(); } -void LLFloater::onClickCloseBtn() +void LLFloater::onClickCloseBtn(bool app_quitting) { closeFloater(false); } |