diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-07-09 18:02:19 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-07-09 18:02:19 -0700 |
| commit | 550c6e369474a68bf43af039cd522165eaac1512 (patch) | |
| tree | f5e21f7861a1e5599a59acec5ee12fc12d12c4a4 /indra/newview/llavataractions.cpp | |
| parent | 1d41ff232870428022006875e98df5be21731c68 (diff) | |
| parent | 9ab042dd1d003da15dd579f366db04d4aae3ff6b (diff) | |
Pull from richard/viewer-chui
Diffstat (limited to 'indra/newview/llavataractions.cpp')
| -rwxr-xr-x | indra/newview/llavataractions.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp index fb32bcbd60..6babdc1f44 100755 --- a/indra/newview/llavataractions.cpp +++ b/indra/newview/llavataractions.cpp @@ -235,7 +235,7 @@ void LLAvatarActions::startCall(const LLUUID& id) } // static -void LLAvatarActions::startAdhocCall(const uuid_vec_t& ids) +void LLAvatarActions::startAdhocCall(const uuid_vec_t& ids, const LLUUID& floater_id) { if (ids.size() == 0) { @@ -252,7 +252,7 @@ void LLAvatarActions::startAdhocCall(const uuid_vec_t& ids) // create the new ad hoc voice session const std::string title = LLTrans::getString("conference-title"); LLUUID session_id = gIMMgr->addSession(title, IM_SESSION_CONFERENCE_START, - ids[0], id_array, true); + ids[0], id_array, true, floater_id); if (session_id == LLUUID::null) { return; |