diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-02-05 21:13:38 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-02-05 21:13:38 +0000 |
| commit | 77f04c74eb1603bf2fadc30127d05378bfc7a48a (patch) | |
| tree | 3f1a0ff9bfbff52fcea8d150c02e7fb2c11f00f8 /indra/llui | |
| parent | d1582a5105f01181535fb859c530e45c2efca071 (diff) | |
merge -r 57517:57620 maintenance.
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llfloater.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index 8dc0ce5f66..f6eb1e8bf8 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -2193,7 +2193,7 @@ LLFloater *LLFloaterView::getFrontmost() for ( child_list_const_iter_t child_it = getChildList()->begin(); child_it != getChildList()->end(); ++child_it) { LLView* viewp = *child_it; - if ( viewp->getVisible() ) + if ( viewp->getVisible() && !viewp->isDead()) { return (LLFloater *)viewp; } |