diff options
| author | Eli Linden <eli@lindenlab.com> | 2010-03-18 12:40:11 -0700 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2010-03-18 12:40:11 -0700 |
| commit | a04cdf5af27965d560dade1778fd3fbeaf88a912 (patch) | |
| tree | 91049b441d3e1efac03055678596ae366b173b8f /indra/newview/llnamelistctrl.cpp | |
| parent | 73802de5d5d0a3b294e7187f7b00c302217aec72 (diff) | |
| parent | 3e2db3d3364e3bb146da9d94b25638bd9fd7de29 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llnamelistctrl.cpp')
| -rw-r--r-- | indra/newview/llnamelistctrl.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llnamelistctrl.cpp b/indra/newview/llnamelistctrl.cpp index 883d4cdf4b..7a538e372b 100644 --- a/indra/newview/llnamelistctrl.cpp +++ b/indra/newview/llnamelistctrl.cpp @@ -142,11 +142,12 @@ void LLNameListCtrl::showInspector(const LLUUID& avatar_id, bool is_group) void LLNameListCtrl::mouseOverHighlightNthItem( S32 target_index ) { - if (getHighlightedItemInx()!= target_index) + S32 cur_index = getHighlightedItemInx(); + if (cur_index != target_index) { - if(getHighlightedItemInx()!=-1) + if(0 <= cur_index && cur_index < (S32)getItemList().size()) { - LLScrollListItem* item = getItemList()[getHighlightedItemInx()]; + LLScrollListItem* item = getItemList()[cur_index]; LLScrollListText* cell = dynamic_cast<LLScrollListText*>(item->getColumn(mNameColumnIndex)); if(cell) cell->setTextWidth(cell->getTextWidth() + info_icon_size); |