diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-08-08 07:24:42 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-08-08 07:24:42 +0800 |
| commit | 73fdef6693017f1160875d1f7a79875945df3929 (patch) | |
| tree | 4d68801d232b579d03fef2306c53637f7498df45 /indra/newview/llpanelgroupbulkimpl.h | |
| parent | 3b776461127f193298018cbe1bbeb92478cca485 (diff) | |
| parent | bfefc01a7baefa6377216ff236be6113c46fa879 (diff) | |
Merge branch '2025.05' into 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 |