diff options
| author | Josh Bell <josh@lindenlab.com> | 2008-01-28 23:36:41 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2008-01-28 23:36:41 +0000 |
| commit | 6ae0a9e2c1ac51385c341ff4a93384950e2e7e40 (patch) | |
| tree | e4c7b66768581bcd656148e13e732f43f9f11829 /indra/llui/llscrolllistctrl.cpp | |
| parent | 5a85e84dea0828aeaac2dbafbdfcdab436648c74 (diff) | |
svn merge -r 78408:78432 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-0-Viewer
Port these changes which have passed QA in QAR-186:
* Bumping version numbers to 1.19.0
* DEV-8872 Text in group list in profile and group notices is difficult to read
* DEV-9290 Clicking on Chat button in toolbar does not toggle chat bar
* DEV-4721 Upload symbol map files to S3
Diffstat (limited to 'indra/llui/llscrolllistctrl.cpp')
| -rw-r--r-- | indra/llui/llscrolllistctrl.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp index 346b120c39..d6be3d045f 100644 --- a/indra/llui/llscrolllistctrl.cpp +++ b/indra/llui/llscrolllistctrl.cpp @@ -1364,7 +1364,7 @@ LLScrollListItem* LLScrollListCtrl::addCommentText(const LLString& comment_text, { // simple items have their LLSD data set to their label // always draw comment text with "enabled" color - item = new LLScrollListItemComment( comment_text, mFgSelectedColor ); + item = new LLScrollListItemComment( comment_text, mFgUnselectedColor ); addItem( item, pos, FALSE ); } return item; @@ -1664,11 +1664,12 @@ void LLScrollListCtrl::drawItems() if( mScrollLines <= line && line < mScrollLines + num_page_lines ) { - fg_color = (item->getEnabled() ? mFgSelectedColor : mFgDisabledColor); + fg_color = (item->getEnabled() ? mFgUnselectedColor : mFgDisabledColor); if( item->getSelected() && mCanSelect) { // Draw background of selected item bg_color = mBgSelectedColor; + fg_color = mFgSelectedColor; } else if (mHighlightedItem == line && mCanSelect) { |