summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelgroup.cpp
diff options
context:
space:
mode:
authorBrad Linden <46733234+brad-linden@users.noreply.github.com>2024-06-20 16:02:10 -0700
committerGitHub <noreply@github.com>2024-06-20 16:02:10 -0700
commit68963019cd62fedf94ade25c83f22804ec237818 (patch)
tree958d58f7e236ec6d1f5773ef30300a5e3314e832 /indra/newview/llpanelgroup.cpp
parent2515f422cfea1d2ad6947022636c1e3a70f4b282 (diff)
parenta52391d582ec7299273d3ff38efdb2455da7700e (diff)
Merge pull request #1791 from secondlife/brad/webrtc-voice-develop
webrtc-voice merge to develop
Diffstat (limited to 'indra/newview/llpanelgroup.cpp')
-rw-r--r--indra/newview/llpanelgroup.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelgroup.cpp b/indra/newview/llpanelgroup.cpp
index db9f1078fe..519f157973 100644
--- a/indra/newview/llpanelgroup.cpp
+++ b/indra/newview/llpanelgroup.cpp
@@ -292,7 +292,7 @@ void LLPanelGroup::changed(LLGroupChange gc)
}
// virtual
-void LLPanelGroup::onChange(EStatusType status, const std::string &channelURI, bool proximal)
+void LLPanelGroup::onChange(EStatusType status, const LLSD& channelInfo, bool proximal)
{
if(status == STATUS_JOINING || status == STATUS_LEFT_CHANNEL)
{