diff options
| author | Roxanne Skelly <roxie@lindenlab.com> | 2024-04-28 21:03:33 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-28 21:03:33 -0700 |
| commit | 7cdc327de9df4773f933e1e558eb79c9aabfa787 (patch) | |
| tree | 71a5ba489948e8a95ff1b6228733f6d97cac2441 /indra/newview/llimview.h | |
| parent | b09070a3acc229a933f2001c0025c913240d823b (diff) | |
| parent | 57182b2ac01007d3d5d11c98e811e05d2c50405c (diff) | |
Merge pull request #1349 from secondlife/roxie/webrtc-voice
[WebRTC-Voice] Fix server reconnect issue (and other issues)
Diffstat (limited to 'indra/newview/llimview.h')
| -rw-r--r-- | indra/newview/llimview.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h index 93a1a95b23..16444a6755 100644 --- a/indra/newview/llimview.h +++ b/indra/newview/llimview.h @@ -80,9 +80,11 @@ public: } SType; LLIMSession(const LLUUID& session_id, const std::string& name, - const EInstantMessage& type, const LLUUID& other_participant_id, const uuid_vec_t& ids, const LLSD& voiceChannelInfo, bool has_offline_msg); + const EInstantMessage& type, const LLUUID& other_participant_id, const LLSD& voiceChannelInfo, const uuid_vec_t& ids, bool has_offline_msg); virtual ~LLIMSession(); + void initVoiceChannel(const LLSD &voiceChannelInfo = LLSD()); + void sessionInitReplyReceived(const LLUUID& new_session_id); void addMessagesFromHistoryCache(const std::list<LLSD>& history); // From local file void addMessagesFromServerHistory(const LLSD& history, const std::string& target_from, const std::string& target_message, U32 timestamp); // From chat server @@ -141,6 +143,7 @@ public: LLVoiceChannel* mVoiceChannel; LLIMSpeakerMgr* mSpeakers; + bool mP2PAsAdhocCall; bool mSessionInitialized; @@ -284,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; + LLVoiceChannel* getVoiceChannel(const LLUUID& session_id, const LLSD& voice_channel_info = LLSD()) const; /** * Get im speaker manager for the session specified by session_id @@ -464,7 +467,7 @@ public: * Start call in a session * @return false if voice channel doesn't exist **/ - bool startCall(const LLUUID& session_id, LLVoiceChannel::EDirection direction = LLVoiceChannel::OUTGOING_CALL); + bool startCall(const LLUUID& session_id, LLVoiceChannel::EDirection direction = LLVoiceChannel::OUTGOING_CALL, const LLSD& voice_channel_info = LLSD()); /** * End call in a session |