diff options
| author | Richard Linden <none@none> | 2010-06-01 18:28:46 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-06-01 18:28:46 -0700 |
| commit | 71fe767d9a151c6e92d7cdb6b9ab820ce814de44 (patch) | |
| tree | 80a4a533c739f9efeeea1fe8e572db3c459acb70 /indra | |
| parent | 76afe7c0f5385a7eacbe96c501c0818cd4408619 (diff) | |
EXT-7590 FIX Modal alerts obscure any modal alerts that they spawn
the toast logic to set visibility on dialogs in reverse order was bringing older modal dialogs to the front
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llui/llfloater.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/lltoast.cpp | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index d77c5ead4e..fad98e553f 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -2519,7 +2519,7 @@ LLFloater *LLFloaterView::getBackmost() const void LLFloaterView::syncFloaterTabOrder() { - // look for a visible modal dialog, starting from first (should be only one) + // look for a visible modal dialog, starting from first LLModalDialog* modal_dialog = NULL; for ( child_list_const_iter_t child_it = getChildList()->begin(); child_it != getChildList()->end(); ++child_it) { diff --git a/indra/newview/lltoast.cpp b/indra/newview/lltoast.cpp index 568cd4cb19..9abfab300c 100644 --- a/indra/newview/lltoast.cpp +++ b/indra/newview/lltoast.cpp @@ -271,7 +271,10 @@ void LLToast::setVisible(BOOL show) { mTimer->start(); } - LLModalDialog::setFrontmost(FALSE); + if (!getVisible()) + { + LLModalDialog::setFrontmost(FALSE); + } } else { |