summaryrefslogtreecommitdiff
path: root/indra/llui/llfloater.cpp
diff options
context:
space:
mode:
authorAndreyL ProductEngine <alihatskiy@productengine.com>2016-06-16 23:27:39 +0300
committerAndreyL ProductEngine <alihatskiy@productengine.com>2016-06-16 23:27:39 +0300
commit2b287b6bf7313100c78cc7c6186654e832c1887f (patch)
tree3ef066a27b86f4c85cabe79e37712305215d5fe7 /indra/llui/llfloater.cpp
parent0597f876469d8ef672a270528cbeecc069ab5e66 (diff)
MAINT-6511 Added a null check in LLFloaterView::restoreAll
Diffstat (limited to 'indra/llui/llfloater.cpp')
-rw-r--r--indra/llui/llfloater.cpp5
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