diff options
| author | Don Kjer <don@lindenlab.com> | 2011-07-09 14:58:31 -0700 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2011-07-09 14:58:31 -0700 |
| commit | 121c4034db2de1b73bdab6777f49f302d89af3ca (patch) | |
| tree | 0e0cf941c3838a899d4a31433773e974eb9b4fd4 /indra/llui/llaccordionctrltab.cpp | |
| parent | 7029c8ff534419a3bcfd0e5fc39a4739e4cdc19c (diff) | |
| parent | 961d5b1d65fffff7075d0afbce003586b1f3b197 (diff) | |
Merge
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; |