diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-05-17 16:38:51 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-05-17 16:38:51 -0700 |
| commit | 03dca7cb7e578d20ec07298cecc47e0ae67aaaf5 (patch) | |
| tree | ae3e87e1262a12cf8279be608c7d554112ae53c1 | |
| parent | dfebb9ebb7333387d59aa7ba4e5926671d6681f5 (diff) | |
fixing llaccordian crash with multiple child panels
| -rw-r--r-- | indra/llui/llaccordionctrltab.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/sidepanel_inventory.xml | 35 |
2 files changed, 30 insertions, 7 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; diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml index faf5e28bb8..41b9283edc 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml @@ -75,12 +75,35 @@ min_height="150" fit_panel="false" title="MARKETPLACE INBOX"> - <view - follows="all" - left="0" - height="40" - top="0" - /> + <panel + follows="all" + left="0" + height="40" + width="250" + top="0" + > + <text + left ="40" + top="15" + height="14" + width="100" + >Just a panel</text> + </panel> + <panel + follows="all" + left="0" + height="40" + visible="false" + width="250" + top="0" + > + <text + left ="40" + top="15" + height="14" + width="100" + >Just a panel 2</text> + </panel> </accordion_tab> <accordion_tab name="tab_attachments" |