diff options
author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-07-26 15:41:49 -0400 |
---|---|---|
committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-07-26 15:41:49 -0400 |
commit | ed701685f6d07da47a3a796bd79dfc4ae1860fcc (patch) | |
tree | 244612881e0787e5f6f7be6a319aaad67fb09059 /indra/llui/llaccordionctrltab.cpp | |
parent | c567f0dcdd1b31cc94e9065218a88d48cdaf2278 (diff) | |
parent | c118ec209907618c77613990fe2359d4f92802e6 (diff) |
merged .hgtags
Diffstat (limited to 'indra/llui/llaccordionctrltab.cpp')
-rw-r--r-- | indra/llui/llaccordionctrltab.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llaccordionctrltab.cpp b/indra/llui/llaccordionctrltab.cpp index 9e4849c58b..6afe276379 100644 --- a/indra/llui/llaccordionctrltab.cpp +++ b/indra/llui/llaccordionctrltab.cpp @@ -1022,7 +1022,7 @@ void LLAccordionCtrlTab::updateLayout ( const LLRect& child_rect ) S32 panel_width = child_rect.getWidth(); static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0); - if(mScrollbar->getVisible() != false) + if(mScrollbar && mScrollbar->getVisible() != false) { panel_top+=mScrollbar->getDocPos(); panel_width-=scrollbar_size; |