diff options
| author | Monroe Williams <monroe@lindenlab.com> | 2009-02-27 21:01:19 +0000 |
|---|---|---|
| committer | Monroe Williams <monroe@lindenlab.com> | 2009-02-27 21:01:19 +0000 |
| commit | dd437009e88954fd0fe9dd95b903dbd1ea52e901 (patch) | |
| tree | 5f5cb97ebc5dc4ca3bdbe2867a897e625c54a011 /indra/newview/llimview.h | |
| parent | 0bd557510a20565a4f27318f86dd11dac88ff574 (diff) | |
svn merge -r 113014:113017 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge-QAR-1323
Merging in QAR-1323.
Diffstat (limited to 'indra/newview/llimview.h')
| -rw-r--r-- | indra/newview/llimview.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h index 88109a9154..a4e419694d 100644 --- a/indra/newview/llimview.h +++ b/indra/newview/llimview.h @@ -98,7 +98,8 @@ public: // Creates a P2P session with the requisite handle for responding to voice calls LLUUID addP2PSession(const std::string& name, const LLUUID& other_participant_id, - const std::string& voice_session_handle); + const std::string& voice_session_handle, + const std::string& caller_uri = LLStringUtil::null); // This removes the panel referenced by the uuid, and then // restores internal consistency. The internal pointer is not @@ -112,7 +113,8 @@ public: const std::string& caller_name, EInstantMessage type, EInvitationType inv_type, - const std::string& session_handle = LLStringUtil::null); + const std::string& session_handle = LLStringUtil::null, + const std::string& session_uri = LLStringUtil::null); //Updates a given session's session IDs. Does not open, //create or do anything new. If the old session doesn't |