diff options
| author | James Cook <james@lindenlab.com> | 2009-11-16 21:39:23 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-11-16 21:39:23 -0800 |
| commit | a97941369ddde6a548e91576655d5f52942d085e (patch) | |
| tree | a1e47cf7fc5c843723298aae82e456a69ab7e575 /indra/newview/llnamelistctrl.cpp | |
| parent | 975be13dc55ed1a90abd8ec6769fc5ecd59cd9e2 (diff) | |
EXT-1546 Don't show inspector (i) icon in empty groups list.
Apparently some name lists have placeholder items at the top, so don't show
the inspector icon unless there is a valid UUID.
Diffstat (limited to 'indra/newview/llnamelistctrl.cpp')
| -rw-r--r-- | indra/newview/llnamelistctrl.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/indra/newview/llnamelistctrl.cpp b/indra/newview/llnamelistctrl.cpp index 9439717fb8..7e6145f578 100644 --- a/indra/newview/llnamelistctrl.cpp +++ b/indra/newview/llnamelistctrl.cpp @@ -143,11 +143,14 @@ BOOL LLNameListCtrl::handleToolTip(S32 x, S32 y, MASK mask) BOOL handled = FALSE; S32 column_index = getColumnIndexFromOffset(x); LLScrollListItem* hit_item = hitItem(x, y); - if (hit_item) + if (hit_item + && column_index == mNameColumnIndex) { - if (column_index == mNameColumnIndex) + // ...this is the column with the avatar name + LLUUID avatar_id = hit_item->getValue().asUUID(); + if (avatar_id.notNull()) { - // ...this is the column with the avatar name + // ...valid avatar id LLScrollListCell* hit_cell = hit_item->getColumn(column_index); if (hit_cell) { @@ -160,7 +163,6 @@ BOOL LLNameListCtrl::handleToolTip(S32 x, S32 y, MASK mask) // Spawn at right side of cell LLCoordGL pos( sticky_rect.mRight - 16, sticky_rect.mTop ); LLPointer<LLUIImage> icon = LLUI::getUIImage("Info_Small"); - LLUUID avatar_id = hit_item->getValue().asUUID(); LLToolTip::Params params; params.background_visible( false ); |