diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-09-20 18:03:25 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-09-20 18:03:25 +0100 |
| commit | 6a28f9b242fb30ddd7b4c422f3278ad187939164 (patch) | |
| tree | b4f8adfeee06552c0df7ffee6f9a23ea24362e09 /indra/llui | |
| parent | 85f69fbd8620c98f67a39e9ac09c9946c87251d8 (diff) | |
| parent | 022f9bd9a8b80481bb5ecfd651457fe6df3bae30 (diff) | |
merge storm-192
Diffstat (limited to 'indra/llui')
| -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); } |