summaryrefslogtreecommitdiff
path: root/indra/newview/llimview.h
diff options
context:
space:
mode:
authorRoxanne Skelly <roxie@lindenlab.com>2024-05-19 22:18:55 -0700
committerGitHub <noreply@github.com>2024-05-19 22:18:55 -0700
commitf51797f088808029745161854aa86b775f041a64 (patch)
tree2dc638dae2efac22cc3b4783b9ff0a371d58a044 /indra/newview/llimview.h
parentbe19e495c5483c06b9b90dd18bf8ebbe7ceaa336 (diff)
parentddbd1ab47ea6cd76ed3e6bf32ffaeb73a32b4a97 (diff)
Merge pull request #1449 from secondlife/roxie/webrtc-voice
Fix issue where groups/adhoc chats were named with the initiators display name.
Diffstat (limited to 'indra/newview/llimview.h')
-rw-r--r--indra/newview/llimview.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h
index 16444a6755..e4e42e8f0d 100644
--- a/indra/newview/llimview.h
+++ b/indra/newview/llimview.h
@@ -287,7 +287,7 @@ public:
* Get voice channel for the session specified by session_id
* Returns NULL if the session does not exist
*/
- LLVoiceChannel* getVoiceChannel(const LLUUID& session_id, const LLSD& voice_channel_info = LLSD()) const;
+ LLVoiceChannel* getVoiceChannel(const LLUUID& session_id) const;
/**
* Get im speaker manager for the session specified by session_id