livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
meow-7.2.2
Vadim Savchuk 2010-03-26 19:02:14 +02:00
parent a5227864bd
commit 5a12802503
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llfloaterland.cpp
View File

@ -1612,7 +1612,7 @@ void LLPanelLandObjects::processParcelObjectOwnersReply(LLMessageSystem *msg, vo
item_params.columns.add().value(object_count_str).font(FONT).column("count");
item_params.columns.add().value(LLDate((time_t)most_recent_time)).font(FONT).column("mostrecent").type("date");
self->mOwnerList->addRow(item_params);
self->mOwnerList->addNameItemRow(item_params);
lldebugs << "object owner " << owner_id << " (" << (is_group_owned ? "group" : "agent")
<< ") owns " << object_count << " objects." << llendl;

24
indra/newview/llnamelistctrl.cpp
View File

@ -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<LLScrollListText*>(item->getColumn(mNameColumnIndex));
if(cell)
cell->setTextWidth(cell->getTextWidth() + info_icon_size);
if (item)
{
LLScrollListText* cell = dynamic_cast<LLScrollListText*>(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<LLScrollListText*>(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;
}
}
}