diff options
author | Jacek Antonelli | 2008-08-15 23:44:59 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:44:59 -0500 |
commit | a408bac29378072fbf36864164149458c978cfcc (patch) | |
tree | 67feccf1a5d3816611ba48d6762f86f0f7f4b1f6 /linden/indra/llui/llscrolllistctrl.cpp | |
parent | Second Life viewer sources 1.17.0.12 (diff) | |
download | meta-impy-a408bac29378072fbf36864164149458c978cfcc.zip meta-impy-a408bac29378072fbf36864164149458c978cfcc.tar.gz meta-impy-a408bac29378072fbf36864164149458c978cfcc.tar.bz2 meta-impy-a408bac29378072fbf36864164149458c978cfcc.tar.xz |
Second Life viewer sources 1.17.1.0
Diffstat (limited to 'linden/indra/llui/llscrolllistctrl.cpp')
-rw-r--r-- | linden/indra/llui/llscrolllistctrl.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/linden/indra/llui/llscrolllistctrl.cpp b/linden/indra/llui/llscrolllistctrl.cpp index fd98bd5..5571d39 100644 --- a/linden/indra/llui/llscrolllistctrl.cpp +++ b/linden/indra/llui/llscrolllistctrl.cpp | |||
@@ -98,8 +98,10 @@ protected: | |||
98 | // | 98 | // |
99 | // LLScrollListIcon | 99 | // LLScrollListIcon |
100 | // | 100 | // |
101 | LLScrollListIcon::LLScrollListIcon(LLImageGL* icon, S32 width, LLUUID image_id) : | 101 | LLScrollListIcon::LLScrollListIcon(LLImageGL* icon, S32 width, LLUUID image_id) |
102 | mIcon(icon), mColor(LLColor4::white), mImageUUID(image_id.asString()) | 102 | : mIcon(icon), |
103 | mImageUUID(image_id.asString()), | ||
104 | mColor(LLColor4::white) | ||
103 | { | 105 | { |
104 | if (width) | 106 | if (width) |
105 | { | 107 | { |
@@ -431,21 +433,20 @@ LLScrollListCtrl::LLScrollListCtrl(const LLString& name, const LLRect& rect, | |||
431 | mFgUnselectedColor( LLUI::sColorsGroup->getColor("ScrollUnselectedColor") ), | 433 | mFgUnselectedColor( LLUI::sColorsGroup->getColor("ScrollUnselectedColor") ), |
432 | mFgDisabledColor( LLUI::sColorsGroup->getColor("ScrollDisabledColor") ), | 434 | mFgDisabledColor( LLUI::sColorsGroup->getColor("ScrollDisabledColor") ), |
433 | mHighlightedColor( LLUI::sColorsGroup->getColor("ScrollHighlightedColor") ), | 435 | mHighlightedColor( LLUI::sColorsGroup->getColor("ScrollHighlightedColor") ), |
434 | mHighlightedItem(-1), | ||
435 | mBorderThickness( 2 ), | 436 | mBorderThickness( 2 ), |
436 | mOnDoubleClickCallback( NULL ), | 437 | mOnDoubleClickCallback( NULL ), |
437 | mOnMaximumSelectCallback( NULL ), | 438 | mOnMaximumSelectCallback( NULL ), |
438 | mOnSortChangedCallback( NULL ), | 439 | mOnSortChangedCallback( NULL ), |
439 | mDrewSelected(FALSE), | 440 | mHighlightedItem(-1), |
440 | mBorder(NULL), | 441 | mBorder(NULL), |
441 | mSearchColumn(0), | ||
442 | mDefaultColumn("SIMPLE"), | 442 | mDefaultColumn("SIMPLE"), |
443 | 443 | mSearchColumn(0), | |
444 | mNumDynamicWidthColumns(0), | 444 | mNumDynamicWidthColumns(0), |
445 | mTotalStaticColumnWidth(0), | 445 | mTotalStaticColumnWidth(0), |
446 | mSortColumn(-1), | 446 | mSortColumn(-1), |
447 | mSortAscending(TRUE), | ||
447 | mSorted(TRUE), | 448 | mSorted(TRUE), |
448 | mSortAscending(TRUE) | 449 | mDrewSelected(FALSE) |
449 | { | 450 | { |
450 | mItemListRect.setOriginAndSize( | 451 | mItemListRect.setOriginAndSize( |
451 | mBorderThickness + LIST_BORDER_PAD, | 452 | mBorderThickness + LIST_BORDER_PAD, |