diff options
| author | Igor Borovkov <iborovkov@productengine.com> | 2009-12-14 17:11:15 +0200 |
|---|---|---|
| committer | Igor Borovkov <iborovkov@productengine.com> | 2009-12-14 17:11:15 +0200 |
| commit | c1b31cd97accfbd67f12ffbdff41f61ba9a01843 (patch) | |
| tree | e13a5e68523f6ee2889b8eaf81a8bdc81844a77a /indra/newview/llimview.cpp | |
| parent | 222dfaef0aa16ced2fd6285763467e5bfa8ed574 (diff) | |
| parent | c159d9165dda268f3d8d16e95dac81bc8a9e12be (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index b50d4674f7..b31c484529 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -2043,11 +2043,12 @@ LLUUID LLIMMgr::addP2PSession(const std::string& name, LLUUID LLIMMgr::addSession( const std::string& name, EInstantMessage dialog, - const LLUUID& other_participant_id) + const LLUUID& other_participant_id, + bool voice = false) { LLDynamicArray<LLUUID> ids; ids.put(other_participant_id); - return addSession(name, dialog, other_participant_id, ids); + return addSession(name, dialog, other_participant_id, ids, voice = false); } // Adds a session using the given session_id. If the session already exists @@ -2056,7 +2057,8 @@ LLUUID LLIMMgr::addSession( const std::string& name, EInstantMessage dialog, const LLUUID& other_participant_id, - const LLDynamicArray<LLUUID>& ids) + const LLDynamicArray<LLUUID>& ids, + bool voice = false) { if (0 == ids.getLength()) { |