MAINT-6461 crash due to invalid menu pointer during visibility change

1 files changed, 3 insertions, 12 deletions

diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index 93ee1ceee3..4f664a1ccc 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -2318,19 +2318,10 @@ void LLFloaterView::reshape(S32 width, S32 height, BOOL called_from_parent)
 void LLFloaterView::restoreAll()
 {
 	// make sure all subwindows aren't minimized
-	for ( child_list_const_iter_t child_it = getChildList()->begin(); child_it != getChildList()->end(); ++child_it)
+	child_list_t child_list = *(getChildList());
+	for (child_list_const_iter_t child_it = child_list.begin(); child_it != child_list.end(); ++child_it)
 	{
-		LLFloater* floaterp = NULL;
-		try
-		{
-			floaterp = dynamic_cast<LLFloater*>(*child_it);
-		}
-		catch (std::exception e) // See MAINT-6511
-		{
-			LL_WARNS() << "Caught exception: " << e.what() << LL_ENDL;
-			continue;
-		}
-
+		LLFloater* floaterp = dynamic_cast<LLFloater*>(*child_it);
 		if (floaterp)
 		{
 			floaterp->setMinimized(FALSE);