diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-06-22 21:09:34 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-06-22 21:09:34 +0300 |
| commit | 855ba82806893f21e44442209865a691ee1b8938 (patch) | |
| tree | d7c26785afd9c3f2cf85d82fff9d20ba5910ef48 | |
| parent | a183385b2c475cf8096ad26b80f1a6a3dd7e0860 (diff) | |
| parent | 2b287b6bf7313100c78cc7c6186654e832c1887f (diff) | |
Merged in lindenlab/viewer-lynx
| -rw-r--r-- | indra/llui/llfloater.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index 5ea9f5b6cc..69038a8627 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -2321,7 +2321,10 @@ void LLFloaterView::restoreAll() for ( child_list_const_iter_t child_it = getChildList()->begin(); child_it != getChildList()->end(); ++child_it) { LLFloater* floaterp = (LLFloater*)*child_it; - floaterp->setMinimized(FALSE); + if (floaterp) + { + floaterp->setMinimized(FALSE); + } } // *FIX: make sure dependents are restored |