summaryrefslogtreecommitdiff
path: root/indra/llui/llfloater.cpp
diff options
context:
space:
mode:
authorRuslan Teliuk <ruslantproductengine@lindenlab.com>2016-09-27 15:43:53 +0300
committerRuslan Teliuk <ruslantproductengine@lindenlab.com>2016-09-27 15:43:53 +0300
commit999dc6c61ba48c5bd930e63bfc6dc7d1e494b43c (patch)
tree5c0f00f9521aa0298ff2813d5116cf4b12a04597 /indra/llui/llfloater.cpp
parent25c20f98a88a457b5fa865e8dc302b24378bc842 (diff)
parentfa4376b457b887130e98bd96e6bccb231e8947d2 (diff)
Merged lindenlab/viewer-neko into default
Diffstat (limited to 'indra/llui/llfloater.cpp')
-rw-r--r--indra/llui/llfloater.cpp3
1 files changed, 2 insertions, 1 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)