summaryrefslogtreecommitdiff
path: root/indra/newview/llnamelistctrl.cpp
diff options
context:
space:
mode:
authorYuri Chebotarev <ychebotarev@productengine.com>2010-03-26 16:32:38 +0200
committerYuri Chebotarev <ychebotarev@productengine.com>2010-03-26 16:32:38 +0200
commit35b5b5e2a3dceaf98fdf770d971c45b1c80116ed (patch)
tree3f34f5deff668a9a0001f79560b3823dd48d6f49 /indra/newview/llnamelistctrl.cpp
parente962b8418f8a37c1d18743c31199dd9c33d5c74b (diff)
parent379517ce5e1535b20a94ef3a581e1b25223f8798 (diff)
merge
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llnamelistctrl.cpp')
-rw-r--r--indra/newview/llnamelistctrl.cpp7
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);