diff options
| author | Rider Linden <rider@lindenlab.com> | 2016-09-16 14:59:52 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2016-09-16 14:59:52 -0700 |
| commit | 100aa4b79e5ef1aa7ea49fd5ca9a78fa5dfd713c (patch) | |
| tree | a565f3f725e45419b24458b0d819b75cf77018ff /indra/llui | |
| parent | 884b03e8770a64aee22281518a5f3e2a7c0420ab (diff) | |
| parent | 51bb369a39142ff5049f753099f9638ce68b95dc (diff) | |
Merge
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llfloater.cpp | 3 | ||||
| -rw-r--r-- | indra/llui/llfocusmgr.cpp | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index 1f9869fadc..4f664a1ccc 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -2318,7 +2318,8 @@ 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 = dynamic_cast<LLFloater*>(*child_it); if (floaterp) diff --git a/indra/llui/llfocusmgr.cpp b/indra/llui/llfocusmgr.cpp index 1a51b96fdf..1b213c3418 100644 --- a/indra/llui/llfocusmgr.cpp +++ b/indra/llui/llfocusmgr.cpp @@ -186,7 +186,6 @@ void LLFocusMgr::releaseFocusIfNeeded( LLView* view ) LLUI::removePopup(view); } - void LLFocusMgr::setKeyboardFocus(LLFocusableElement* new_focus, BOOL lock, BOOL keystrokes_only) { // notes if keyboard focus is changed again (by onFocusLost/onFocusReceived) |