diff options
| author | Mike Antipov <mantipov@productengine.com> | 2009-12-01 17:04:47 +0200 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2009-12-01 17:04:47 +0200 |
| commit | f5e64315e27877e994b755d0de9d35dde0ccc674 (patch) | |
| tree | 7bd1c1adf0497d2932315b59d6d68f2da7a71170 /indra/newview/llimview.h | |
| parent | 6a91f2b7f6b225f86849c9ebe53add6d2c8382a5 (diff) | |
Work on EXT-2985 (Implement Avaline calls processing in Voice Control Panel)
-- updated reaction to accepting incoming call: added session URI argument. For now avaline caller is shown in the voice controls.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llimview.h')
| -rw-r--r-- | indra/newview/llimview.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h index 40e3a8fb69..b2d3c6b921 100644 --- a/indra/newview/llimview.h +++ b/indra/newview/llimview.h @@ -277,11 +277,16 @@ public: const LLUUID& other_participant_id, const LLDynamicArray<LLUUID>& ids); - // Creates a P2P session with the requisite handle for responding to voice calls + /** + * Creates a P2P session with the requisite handle for responding to voice calls. + * + * @param caller_uri - sip URI of caller. It should be always be passed into the method to avoid + * incorrect working of LLVoiceChannel instances. See EXT-2985. + */ LLUUID addP2PSession(const std::string& name, const LLUUID& other_participant_id, const std::string& voice_session_handle, - const std::string& caller_uri = LLStringUtil::null); + const std::string& caller_uri); /** * Leave the session with session id. Send leave session notification |