diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-07-08 20:16:35 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-07-08 20:16:35 -0400 |
| commit | 093fdcfcd3debd74dc773bf52faa07ea9f5f8b31 (patch) | |
| tree | 9b3a0f7e37ef731cb9d35ef4e87c17a4c3c4b255 /indra/llui/llaccordionctrltab.cpp | |
| parent | 187bc5211437718016a22e60c7b5ed29823c8510 (diff) | |
| parent | 255fc0401ebde80cfde88995a18fc77a36e3479b (diff) | |
merge changes for storm-1489
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; |