diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-01-19 19:24:01 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-01-19 19:24:01 +0200 |
| commit | a2d083f3ce7b490c88285410591dbcf3592609a2 (patch) | |
| tree | 711895462189a1bcc122d75cb10788245eec7b1a /indra/newview/llnamelistctrl.h | |
| parent | c008e692b5a92c6c70dd9fe1098dcc735c98d5a2 (diff) | |
Fixed major bug EXT-4336 (Inspectors display groups as people).
Added storing item type (avatar/group) in its value, so that we can choose the proper inspector.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llnamelistctrl.h')
| -rw-r--r-- | indra/newview/llnamelistctrl.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llnamelistctrl.h b/indra/newview/llnamelistctrl.h index d0f0ec4d21..192a3a5afa 100644 --- a/indra/newview/llnamelistctrl.h +++ b/indra/newview/llnamelistctrl.h @@ -94,7 +94,7 @@ public: void addNameItem(NameItem& item, EAddPosition pos = ADD_BOTTOM); /*virtual*/ LLScrollListItem* addElement(const LLSD& element, EAddPosition pos = ADD_BOTTOM, void* userdata = NULL); - LLScrollListItem* addNameItemRow(const NameItem& value, EAddPosition pos = ADD_BOTTOM); + LLScrollListItem* addNameItemRow(const NameItem& value, EAddPosition pos = ADD_BOTTOM, std::string& suffix = LLStringUtil::null); // Add a user to the list by name. It will be added, the name // requested from the cache, and updated as necessary. @@ -121,7 +121,8 @@ public: /*virtual*/ void updateColumns(); private: - void showAvatarInspector(const LLUUID& avatar_id); + void showInspector(const LLUUID& avatar_id, bool is_group); + static LLUUID getItemId(LLScrollListItem* item); private: S32 mNameColumnIndex; |