summaryrefslogtreecommitdiff
path: root/indra/llui/llfloater.cpp
diff options
context:
space:
mode:
authorprep <prep@lindenlab.com>2013-06-03 16:10:46 -0400
committerprep <prep@lindenlab.com>2013-06-03 16:10:46 -0400
commitc81b685b4217b3c321815e1993d39fb0b479a767 (patch)
tree5faba0482e6b9b8c74f9ebda861b294779e33e9b /indra/llui/llfloater.cpp
parent7f2cf1fa9cf7c09af8eeab3aa077eb0a9922d631 (diff)
Fix for sh-4221 Sometimes ctrl+q needed to be hit twice
Diffstat (limited to 'indra/llui/llfloater.cpp')
-rwxr-xr-xindra/llui/llfloater.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index ae4961559e..63491aa296 100755
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -704,9 +704,9 @@ void LLFloater::openFloater(const LLSD& key)
dirtyRect();
}
-void LLFloater::verifyClose()
+void LLFloater::verifyClose( bool app_quitting )
{
- LLPanel::handleCloseConfirmation();
+ LLPanel::handleCloseConfirmation( app_quitting );
}
void LLFloater::closeFloater(bool app_quitting)
@@ -726,7 +726,7 @@ void LLFloater::closeFloater(bool app_quitting)
}
if (app_quitting)
- {
+ {
LLFloater::sQuitting = true;
}
@@ -2659,7 +2659,7 @@ void LLFloaterView::closeAllChildren(bool app_quitting)
{
if ( floaterp->mVerifyUponClose )
{
- floaterp->verifyClose();
+ floaterp->verifyClose(app_quitting);
}
else
{