From c994b57fa483d09367546d27434c25a316d86fe0 Mon Sep 17 00:00:00 2001 From: Leyla Farazha Date: Thu, 19 Nov 2009 16:29:20 -0800 Subject: EXT-2490 Right click context menu for objects should include build tools EXT-2541 Help > Report Abuse screenshot not showing up EXT-2549 Crash on exit from mouse-look (Mini Map related) EXT-2548 Viewer freezes when going out of the mouselook while there are more than two floaters EXT-1983 [BSI] Trying to edit a script in a no mod object pops up script editor with "object out of range" reviewed by Richard --- indra/llui/llfloater.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'indra/llui') diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index 2a0dcaf333..bf965e8e28 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -2526,8 +2526,12 @@ void LLFloaterView::pushVisibleAll(BOOL visible, const skip_list_t& skip_list) void LLFloaterView::popVisibleAll(const skip_list_t& skip_list) { - for (child_list_const_iter_t child_iter = getChildList()->begin(); - child_iter != getChildList()->end(); ++child_iter) + // make a copy of the list since some floaters change their + // order in the childList when changing visibility. + child_list_t child_list_copy = *getChildList(); + + for (child_list_const_iter_t child_iter = child_list_copy.begin(); + child_iter != child_list_copy.end(); ++child_iter) { LLView *view = *child_iter; if (skip_list.find(view) == skip_list.end()) -- cgit v1.2.3 From 496ad115b102111cb394c09663d9da579f07b606 Mon Sep 17 00:00:00 2001 From: angela Date: Fri, 20 Nov 2009 09:47:47 +0800 Subject: Fix EXT-2645 Ensure link colors applied consistently to all text sources --- indra/llui/lltextbase.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/llui') diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index cd795282f9..e210667764 100644 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -1505,6 +1505,7 @@ void LLTextBase::appendText(const std::string &new_text, bool prepend_newline, c LLStyle::Params link_params = style_params; link_params.color = match.getColor(); + link_params.readonly_color = match.getColor(); // apply font name from requested style_params std::string font_name = LLFontGL::nameFromFont(style_params.font()); std::string font_size = LLFontGL::sizeFromFont(style_params.font()); -- cgit v1.2.3