summaryrefslogtreecommitdiff
path: root/indra/llui/llaccordionctrltab.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2017-08-16 15:43:58 -0400
committerOz Linden <oz@lindenlab.com>2017-08-16 15:43:58 -0400
commit01e0b78c595e346bef4e771f9580006dd895367c (patch)
tree90160c9edb07baa4fcfd022082608f96b1bfdc06 /indra/llui/llaccordionctrltab.cpp
parent2368c44a8e2b031e5a8ac199923a016915cfe96a (diff)
parentcf865bb5962a85e2da3414468d6a99ecb5423f97 (diff)
merge changes for DRTVWR-439
Diffstat (limited to 'indra/llui/llaccordionctrltab.cpp')
-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);