diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-06-27 20:52:28 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-06-27 20:52:28 +0800 |
| commit | 191170d4328c9d2356d99428276ba2f77977d2af (patch) | |
| tree | deebd5b29213d2a60104f0d09dba6e82c5afbeb5 /indra/newview/llpanelpeople.h | |
| parent | 9890ebc0978e0ec3567fb78dba4bd2d4a18855f3 (diff) | |
| parent | 9bc3dfbdeaba904999880f6b59306128c98469e8 (diff) | |
Merge remote-tracking branch 'secondlife/release/webrtc-voice' into webrtc-voice
Diffstat (limited to 'indra/newview/llpanelpeople.h')
| -rw-r--r-- | indra/newview/llpanelpeople.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelpeople.h b/indra/newview/llpanelpeople.h index f38c71e0b2..a00700700c 100644 --- a/indra/newview/llpanelpeople.h +++ b/indra/newview/llpanelpeople.h @@ -55,7 +55,7 @@ public: /*virtual*/ bool notifyChildren(const LLSD& info); // Implements LLVoiceClientStatusObserver::onChange() to enable call buttons // when voice is available - /*virtual*/ void onChange(EStatusType status, const std::string &channelURI, bool proximal); + /*virtual*/ void onChange(EStatusType status, const LLSD& channelInfo, bool proximal); // internals class Updater; |