livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Crashfix in LLScrollListCtrl; Viewer crashes on opening gesture editor

Ansariel 2011-12-05 01:17:21 +01:00
parent 11b323bcb7
commit 98751d2705
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/llui/llscrolllistctrl.cpp
View File

@ -279,7 +279,6 @@ LLScrollListCtrl::LLScrollListCtrl(const LLScrollListCtrl::Params& p)
// word wrap was added accroding to the EXT-6841
text_p.wrap(true);
addChild(LLUICtrlFactory::create<LLTextBox>(text_p));
mCommentTextView=getChildView("comment_text");
}
S32 LLScrollListCtrl::getSearchColumn()
@ -478,6 +477,10 @@ void LLScrollListCtrl::updateLayout()
getRect().getWidth() - 2 * mBorderThickness,
getRect().getHeight() - (2 * mBorderThickness ) - heading_size );
if (mCommentTextView == NULL)
{
mCommentTextView = getChildView("comment_text");
}
mCommentTextView->setShape(mItemListRect);
// how many lines of content in a single "page"
@ -1493,7 +1496,10 @@ void LLScrollListCtrl::draw()
mColumnsDirty = FALSE;
}
mCommentTextView->setVisible(mItemList.empty());
if (mCommentTextView)
{
mCommentTextView->setVisible(mItemList.empty());
}
drawItems();