diff options
author | Dave Parks <davep@lindenlab.com> | 2011-11-29 12:10:31 -0600 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2011-11-29 12:10:31 -0600 |
commit | 893b5e16b81ead08ef22b03594e0a835df525778 (patch) | |
tree | 25166e9edda070e62780d69d0061cb5c197b21a8 /indra/llui/llscrolllistctrl.cpp | |
parent | d22584bfe51c034076d9e8df01f70628abc22f85 (diff) | |
parent | 1da7f4222479cc98bb85341de6a3bc93cd6fa4b4 (diff) |
merge
Diffstat (limited to 'indra/llui/llscrolllistctrl.cpp')
-rw-r--r-- | indra/llui/llscrolllistctrl.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp index 622f3e215c..466fac33ea 100644 --- a/indra/llui/llscrolllistctrl.cpp +++ b/indra/llui/llscrolllistctrl.cpp @@ -175,6 +175,7 @@ LLScrollListCtrl::LLScrollListCtrl(const LLScrollListCtrl::Params& p) mBorder(NULL), mSortCallback(NULL), mPopupMenu(NULL), + mCommentTextView(NULL), mNumDynamicWidthColumns(0), mTotalStaticColumnWidth(0), mTotalColumnPadding(0), @@ -476,7 +477,12 @@ void LLScrollListCtrl::updateLayout() getRect().getWidth() - 2 * mBorderThickness, getRect().getHeight() - (2 * mBorderThickness ) - heading_size ); - getChildView("comment_text")->setShape(mItemListRect); + if (mCommentTextView == NULL) + { + mCommentTextView = getChildView("comment_text"); + } + + mCommentTextView->setShape(mItemListRect); // how many lines of content in a single "page" S32 page_lines = getLinesPerPage(); |