diff options
| author | Nicky <nicky.dasmijn@posteo.nl> | 2024-08-03 14:30:06 +0200 |
|---|---|---|
| committer | Nicky <nicky.dasmijn@posteo.nl> | 2024-08-03 14:30:06 +0200 |
| commit | 04c47b95323a8022785e58fec03c14769ddfa6af (patch) | |
| tree | 2e781e03d8af6bc231f9340b1e289234c363ff20 /indra/newview/llpanelgroupbulkimpl.h | |
| parent | f480075e1ffbcc026843a3d14fd6533aad1e7126 (diff) | |
| parent | 2ee039c736f64c91bb4f16e403360cddb0089707 (diff) | |
Merge remote-tracking branch 'll/marchcat/b-develop' into feature/warning_cleansweep
Diffstat (limited to 'indra/newview/llpanelgroupbulkimpl.h')
| -rw-r--r-- | indra/newview/llpanelgroupbulkimpl.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llpanelgroupbulkimpl.h b/indra/newview/llpanelgroupbulkimpl.h index 963780200a..5a479f8117 100644 --- a/indra/newview/llpanelgroupbulkimpl.h +++ b/indra/newview/llpanelgroupbulkimpl.h @@ -50,9 +50,10 @@ public: static void callbackClickCancel(void* userdata); static void callbackSelect(LLUICtrl* ctrl, void* userdata); - static void callbackAddUsers(const uuid_vec_t& agent_ids, void* user_data); - static void onAvatarNameCache(const LLUUID& agent_id, const LLAvatarName& av_name, void* user_data); + void addUsers(const uuid_vec_t& agent_ids); + + void onAvatarNameCache(const LLUUID& agent_id, const LLAvatarName& av_name); void handleRemove(); void handleSelection(); |