diff options
| author | Matthew Breindel (Falcon) <falcon@lindenlab.com> | 2010-03-31 17:36:16 -0700 |
|---|---|---|
| committer | Matthew Breindel (Falcon) <falcon@lindenlab.com> | 2010-03-31 17:36:16 -0700 |
| commit | 6a8df364063639f342592aa40c8aa490d3f73403 (patch) | |
| tree | be649cd320bf14c48b982135e58acb2353953a63 /indra/newview/llnamelistctrl.cpp | |
| parent | b2381a039de7e0edbd643d198b85ba8e00524b6b (diff) | |
| parent | 122308205b2958b27152b9dd5375554ef76dd084 (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); |