diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-12-02 12:52:13 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-12-02 12:52:13 -0800 |
| commit | 7bb862c8c1aa56fea6e533d5a257b3d39b428cac (patch) | |
| tree | 6a66c190788be7c2b9797e682c5c09037a95729a /indra/newview/llimview.h | |
| parent | 6d3ca60f310e50b217a189086b652dca2e3e3854 (diff) | |
| parent | d550339958c14f0d7fd222a8531df639eac49e63 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llimview.h')
| -rw-r--r-- | indra/newview/llimview.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h index 40e3a8fb69..66f92c83a5 100644 --- a/indra/newview/llimview.h +++ b/indra/newview/llimview.h @@ -60,6 +60,8 @@ public: virtual ~LLIMSession(); void sessionInitReplyReceived(const LLUUID& new_session_id); + + void addMessagesFromHistory(const std::list<LLSD>& history); void addMessage(const std::string& from, const LLUUID& from_id, const std::string& utf8_text, const std::string& time); void onVoiceChannelStateChanged(const LLVoiceChannel::EState& old_state, const LLVoiceChannel::EState& new_state); static void chatFromLogFile(LLLogChat::ELogLineType type, const LLSD& msg, void* userdata); @@ -277,11 +279,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 |