diff options
| author | Kelly Washington <kelly@lindenlab.com> | 2007-06-21 22:40:22 +0000 |
|---|---|---|
| committer | Kelly Washington <kelly@lindenlab.com> | 2007-06-21 22:40:22 +0000 |
| commit | e03bb0606a10f29c8b94909a713a5bb5c69e88b7 (patch) | |
| tree | 6d8d07894579438c8cc70e08f5730c3c95dfe768 /indra/llui/llscrolllistctrl.cpp | |
| parent | 2638f12f95eea692502836cf6548b4a0b234d009 (diff) | |
merge -r62831:64079 branches/maintenance to release
Diffstat (limited to 'indra/llui/llscrolllistctrl.cpp')
| -rw-r--r-- | indra/llui/llscrolllistctrl.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp index 4c01387941..1d07d3f36b 100644 --- a/indra/llui/llscrolllistctrl.cpp +++ b/indra/llui/llscrolllistctrl.cpp @@ -78,8 +78,10 @@ protected: // // LLScrollListIcon // -LLScrollListIcon::LLScrollListIcon(LLImageGL* icon, S32 width, LLUUID image_id) : -mIcon(icon), mColor(LLColor4::white), mImageUUID(image_id.asString()) +LLScrollListIcon::LLScrollListIcon(LLImageGL* icon, S32 width, LLUUID image_id) + : mIcon(icon), + mImageUUID(image_id.asString()), + mColor(LLColor4::white) { if (width) { @@ -411,21 +413,20 @@ LLScrollListCtrl::LLScrollListCtrl(const LLString& name, const LLRect& rect, mFgUnselectedColor( LLUI::sColorsGroup->getColor("ScrollUnselectedColor") ), mFgDisabledColor( LLUI::sColorsGroup->getColor("ScrollDisabledColor") ), mHighlightedColor( LLUI::sColorsGroup->getColor("ScrollHighlightedColor") ), - mHighlightedItem(-1), mBorderThickness( 2 ), mOnDoubleClickCallback( NULL ), mOnMaximumSelectCallback( NULL ), mOnSortChangedCallback( NULL ), - mDrewSelected(FALSE), + mHighlightedItem(-1), mBorder(NULL), - mSearchColumn(0), mDefaultColumn("SIMPLE"), - + mSearchColumn(0), mNumDynamicWidthColumns(0), mTotalStaticColumnWidth(0), mSortColumn(-1), + mSortAscending(TRUE), mSorted(TRUE), - mSortAscending(TRUE) + mDrewSelected(FALSE) { mItemListRect.setOriginAndSize( mBorderThickness + LIST_BORDER_PAD, |