diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-09-21 10:50:34 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-09-21 10:50:34 -0400 |
| commit | 3a1f0ef173e5853f20aed93c741a9f74637d7d36 (patch) | |
| tree | a777b8671ceb5d9a8916a72a4d31c0e45309bead /indra/llui/llfloater.cpp | |
| parent | 9b16a05c07372d2d86be0be1b914086984ea5285 (diff) | |
| parent | 90cd379508d41e5930e4f62f86a229d5f14c66e3 (diff) | |
Automated merge from viewer-development-shining
Diffstat (limited to 'indra/llui/llfloater.cpp')
| -rw-r--r-- | indra/llui/llfloater.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index c0942cf3c7..eb5d7a6b6a 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -2390,7 +2390,9 @@ void LLFloaterView::closeAllChildren(bool app_quitting) // Attempt to close floater. This will cause the "do you want to save" // dialogs to appear. - if (floaterp->canClose() && !floaterp->isDead()) + // Skip invisible floaters if we're not quitting (STORM-192). + if (floaterp->canClose() && !floaterp->isDead() && + (app_quitting || floaterp->getVisible())) { floaterp->closeFloater(app_quitting); } |