diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-08-25 17:34:10 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-08-25 17:34:10 +0300 |
| commit | 98d7c356547c48ae5a260bc595130ea1c8306bc9 (patch) | |
| tree | 3758dd4ef3bc7f3c97591cc90a7a22e97fc08792 /indra | |
| parent | 1b8f2f1db9c86516f7c149031f9b67764868d100 (diff) | |
| parent | 7ea2f091a69794ce4aa121968175f69d88f0e644 (diff) | |
Merge
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llui/llfloater.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index b3048a9b16..93ee1ceee3 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -2320,7 +2320,7 @@ 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) { - LLFloater* floaterp = nullptr; + LLFloater* floaterp = NULL; try { floaterp = dynamic_cast<LLFloater*>(*child_it); |