summaryrefslogtreecommitdiff
path: root/indra/llui/llaccordionctrltab.cpp
diff options
context:
space:
mode:
authorcallum_linden <none@none>2017-08-22 14:32:04 -0700
committercallum_linden <none@none>2017-08-22 14:32:04 -0700
commitb5dbb9c52aa8f9379662f1ff1169adadcf8ac5f8 (patch)
tree438d099240df63608825568d162874e186835994 /indra/llui/llaccordionctrltab.cpp
parent8e6751efced8d9f5ede5ec5d954ff809d56d1162 (diff)
parent58176de9574164e31790a148d9b5489a129fc961 (diff)
Automated merge with head of ll/viewer64 after DRTVWR-439 merge
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);