summaryrefslogtreecommitdiff
path: root/indra/llui/llfloater.cpp
diff options
context:
space:
mode:
authorprep@lindenlab.com <prep@lindenlab.com>2013-05-28 11:51:11 -0500
committerprep@lindenlab.com <prep@lindenlab.com>2013-05-28 11:51:11 -0500
commitc498f53d9ab02a41886b55762883d116801fd39b (patch)
tree027fd1825c5837e51fa8c460d0735a6a19c2b9da /indra/llui/llfloater.cpp
parent34d2cd03765b6b9b582035a933f4ec11fb262ff4 (diff)
Sh-4035: Updated implementation according to new specs. Fixed a couple of outstanding bugs.
Diffstat (limited to 'indra/llui/llfloater.cpp')
-rwxr-xr-xindra/llui/llfloater.cpp12
1 files changed, 12 insertions, 0 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index 28dfda8faf..ae4961559e 100755
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -713,6 +713,18 @@ void LLFloater::closeFloater(bool app_quitting)
{
llinfos << "Closing floater " << getName() << llendl;
+ if (!app_quitting)
+ {
+ if ( mVerifyUponClose && !mForceCloseAfterVerify )
+ {
+ onClose( app_quitting );
+ if ( mForceCloseAfterVerify )
+ {
+ return;
+ }
+ }
+ }
+
if (app_quitting)
{
LLFloater::sQuitting = true;