From 77f04c74eb1603bf2fadc30127d05378bfc7a48a Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Mon, 5 Feb 2007 21:13:38 +0000 Subject: merge -r 57517:57620 maintenance. --- indra/llui/llfloater.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/llui/llfloater.cpp') 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; } -- cgit v1.3