diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-04-17 08:43:14 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-04-17 08:43:14 -0700 |
| commit | f14888b6166f91533e778e94701b74a9639ebefd (patch) | |
| tree | 75f956b904bdbd774206534416dd6c5119da6a8f /indra/newview/llnamelistctrl.h | |
| parent | b8115d43c95504afa0a15a091e3d1ab389c71366 (diff) | |
| parent | 81dbd3663bdaff741e68de0ec4d4d35bedf6649d (diff) | |
Merge 6.2.1
Diffstat (limited to 'indra/newview/llnamelistctrl.h')
| -rw-r--r-- | indra/newview/llnamelistctrl.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llnamelistctrl.h b/indra/newview/llnamelistctrl.h index 677b49e667..ef0be135e6 100644 --- a/indra/newview/llnamelistctrl.h +++ b/indra/newview/llnamelistctrl.h @@ -154,6 +154,8 @@ public: void removeNameItem(const LLUUID& agent_id); + LLScrollListItem* getNameItemByAgentId(const LLUUID& agent_id); + // LLView interface /*virtual*/ BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDragAndDropType cargo_type, void *cargo_data, @@ -171,6 +173,7 @@ public: private: void showInspector(const LLUUID& avatar_id, bool is_group, bool is_experience = false); void onAvatarNameCache(const LLUUID& agent_id, const LLAvatarName& av_name, std::string suffix, std::string prefix, LLHandle<LLNameListItem> item); + void onGroupNameCache(const LLUUID& group_id, const std::string name, LLHandle<LLNameListItem> item); private: S32 mNameColumnIndex; @@ -179,6 +182,7 @@ private: bool mShortNames; // display name only, no SLID typedef std::map<LLUUID, boost::signals2::connection> avatar_name_cache_connection_map_t; avatar_name_cache_connection_map_t mAvatarNameCacheConnections; + avatar_name_cache_connection_map_t mGroupNameCacheConnections; S32 mPendingLookupsRemaining; namelist_complete_signal_t mNameListCompleteSignal; |