diff options
| author | Seth ProductEngine <slitovchuk@productengine.com> | 2012-07-03 22:31:58 +0300 |
|---|---|---|
| committer | Seth ProductEngine <slitovchuk@productengine.com> | 2012-07-03 22:31:58 +0300 |
| commit | ad1f2eb5106a9ba0217ff1080d029f912ecc25e5 (patch) | |
| tree | 2a9ade8c7812f5777ef60e96408d97e6432a4b05 /indra/newview/llavataractions.cpp | |
| parent | 38eb726ca8ecbc52f9afe2181474074a8bc59211 (diff) | |
CHUI-186 CHUI-187 FIX Removing a P2P convrsation from converstaion widget in the upper right corner when a new participant is added.
End call prompt removed when adding a new participant to a P2P voice call.
After adding a participant to a P2P voice conversation the resulting conference call is restarted voice invites to all participants.
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 21367c224d..56c9533e11 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; |