summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorAndreyL ProductEngine <alihatskiy@productengine.com>2017-05-22 21:25:09 +0300
committerAndreyL ProductEngine <alihatskiy@productengine.com>2017-05-22 21:25:09 +0300
commitf0566985b872861414e2f13042b7cc743f967aea (patch)
tree9ee2f222b5d9e457c3b65679c060a582d52e71df /indra/llui
parentf34bee596641318d7480acf624e04af7d8bc8bfc (diff)
parentf5e0a536c1e6de34b6bffc871d1fef1efd963fdf (diff)
Merged in lindenlab/viewer-bear
Diffstat (limited to 'indra/llui')
-rw-r--r--indra/llui/llaccordionctrltab.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llui/llaccordionctrltab.cpp b/indra/llui/llaccordionctrltab.cpp
index f8ef5289db..eaf1284237 100644
--- a/indra/llui/llaccordionctrltab.cpp
+++ b/indra/llui/llaccordionctrltab.cpp
@@ -823,6 +823,11 @@ BOOL LLAccordionCtrlTab::handleKey(KEY key, MASK mask, BOOL called_from_parent)
void LLAccordionCtrlTab::showAndFocusHeader()
{
+ if (!mHeader)
+ {
+ return;
+ }
+
mHeader->setFocus(true);
mHeader->setSelected(mSelectionEnabled);