diff options
| author | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2025-08-06 18:41:52 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-08-06 18:41:52 +0300 |
| commit | 55f1c8b9797836c9816528bb5b772eb83b083b50 (patch) | |
| tree | fdbc5a913c62265f95e610819637e096f0f85339 /indra/newview/llpanelgroupbulkimpl.h | |
| parent | 514b658fde13bb0c0ec862b081eeebf47bace70d (diff) | |
| parent | ce9d66cdd18c58c3b26fbebde633ae00732d7f9f (diff) | |
Merge pull request #4492 Merge Develop into Maint-C (2025.06)
Merge Develop into Maint-C (2025.06)
Diffstat (limited to 'indra/newview/llpanelgroupbulkimpl.h')
| -rw-r--r-- | indra/newview/llpanelgroupbulkimpl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpanelgroupbulkimpl.h b/indra/newview/llpanelgroupbulkimpl.h index 5515bd6d9a..f186ae5373 100644 --- a/indra/newview/llpanelgroupbulkimpl.h +++ b/indra/newview/llpanelgroupbulkimpl.h @@ -59,7 +59,7 @@ public: void handleSelection(); void addUsers(const std::vector<std::string>& names, const uuid_vec_t& agent_ids); - void setGroupName(std::string name); + void setGroupName(const std::string& name); public: @@ -84,7 +84,7 @@ public: void (*mCloseCallback)(void* data); void* mCloseCallbackUserData; - boost::signals2::connection mAvatarNameCacheConnection; + std::map<LLUUID, boost::signals2::connection> mAvatarNameCacheConnections; // The following are for the LLPanelGroupInvite subclass only. // These aren't needed for LLPanelGroupBulkBan, but if we have to add another |