From 8c1d51caf31c7d34c0c6c347576eed141577de2f Mon Sep 17 00:00:00 2001 From: AndreyL ProductEngine Date: Mon, 23 Apr 2018 20:54:08 +0300 Subject: MAINT-8441 Generate Confirmation message when adding a person to a estate list --- indra/newview/llnamelistctrl.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/llnamelistctrl.h') diff --git a/indra/newview/llnamelistctrl.h b/indra/newview/llnamelistctrl.h index 677b49e667..50b4d80302 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, -- cgit v1.2.3 From a1466bcdaf8f085b62855ee05d943b20a9c7dfc8 Mon Sep 17 00:00:00 2001 From: maxim_productengine Date: Thu, 5 Jul 2018 18:00:00 +0300 Subject: MAINT-8587 FIXED "(waiting)" instead of a group name in the Allowed Groups list. --- indra/newview/llnamelistctrl.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/llnamelistctrl.h') diff --git a/indra/newview/llnamelistctrl.h b/indra/newview/llnamelistctrl.h index 50b4d80302..ef0be135e6 100644 --- a/indra/newview/llnamelistctrl.h +++ b/indra/newview/llnamelistctrl.h @@ -173,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 item); + void onGroupNameCache(const LLUUID& group_id, const std::string name, LLHandle item); private: S32 mNameColumnIndex; @@ -181,6 +182,7 @@ private: bool mShortNames; // display name only, no SLID typedef std::map 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; -- cgit v1.2.3