From 5a12802503b8e557b5cdd99202466bb293a4474f Mon Sep 17 00:00:00 2001 From: Vadim Savchuk Date: Fri, 26 Mar 2010 19:02:14 +0200 Subject: Fixed bug EXT-6268 (Group spawns Resident inspector when called from About Land > Objects for group deeded object) Reason: groups were added to the list as avatars, which led to invoking incorrect inspector on hover. Also added a fix for potential crash on hovering name list items. Reviewed by Leyla: https://codereview.productengine.com/secondlife/r/110/ --HG-- branch : product-engine --- indra/newview/llnamelistctrl.cpp | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) (limited to 'indra/newview/llnamelistctrl.cpp') diff --git a/indra/newview/llnamelistctrl.cpp b/indra/newview/llnamelistctrl.cpp index 7a538e372b..9611c286eb 100644 --- a/indra/newview/llnamelistctrl.cpp +++ b/indra/newview/llnamelistctrl.cpp @@ -148,16 +148,30 @@ void LLNameListCtrl::mouseOverHighlightNthItem( S32 target_index ) if(0 <= cur_index && cur_index < (S32)getItemList().size()) { LLScrollListItem* item = getItemList()[cur_index]; - LLScrollListText* cell = dynamic_cast(item->getColumn(mNameColumnIndex)); - if(cell) - cell->setTextWidth(cell->getTextWidth() + info_icon_size); + if (item) + { + LLScrollListText* cell = dynamic_cast(item->getColumn(mNameColumnIndex)); + if (cell) + cell->setTextWidth(cell->getTextWidth() + info_icon_size); + } + else + { + llwarns << "highlighted name list item is NULL" << llendl; + } } if(target_index != -1) { LLScrollListItem* item = getItemList()[target_index]; LLScrollListText* cell = dynamic_cast(item->getColumn(mNameColumnIndex)); - if(cell) - cell->setTextWidth(cell->getTextWidth() - info_icon_size); + if (item) + { + if (cell) + cell->setTextWidth(cell->getTextWidth() - info_icon_size); + } + else + { + llwarns << "target name item is NULL" << llendl; + } } } -- cgit v1.3 From 1f3d4ed06c1ffdfb1a24d9144ab801e196c87fc4 Mon Sep 17 00:00:00 2001 From: Eugene Mutavchi Date: Thu, 22 Apr 2010 13:47:14 +0300 Subject: Fixed major bug EXT-6900(Temporary bans do not show minute countdown in Parcel Ban List) - fixed the passing of suffix argument to LLNameListCtrl::addNameItemRow(). Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/296/ --HG-- branch : product-engine --- indra/newview/llnamelistctrl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llnamelistctrl.cpp') diff --git a/indra/newview/llnamelistctrl.cpp b/indra/newview/llnamelistctrl.cpp index 9611c286eb..d605d4430e 100644 --- a/indra/newview/llnamelistctrl.cpp +++ b/indra/newview/llnamelistctrl.cpp @@ -81,7 +81,7 @@ void LLNameListCtrl::addNameItem(const LLUUID& agent_id, EAddPosition pos, item.enabled = enabled; item.target = INDIVIDUAL; - addNameItemRow(item, pos); + addNameItemRow(item, pos, suffix); } // virtual, public -- cgit v1.3