diff options
author | Erik Kundiman <erik@megapahit.org> | 2024-06-27 20:52:28 +0800 |
---|---|---|
committer | Erik Kundiman <erik@megapahit.org> | 2024-06-27 20:52:28 +0800 |
commit | 191170d4328c9d2356d99428276ba2f77977d2af (patch) | |
tree | deebd5b29213d2a60104f0d09dba6e82c5afbeb5 /indra/newview/llgroupactions.cpp | |
parent | 9890ebc0978e0ec3567fb78dba4bd2d4a18855f3 (diff) | |
parent | 9bc3dfbdeaba904999880f6b59306128c98469e8 (diff) |
Merge remote-tracking branch 'secondlife/release/webrtc-voice' into webrtc-voice
Diffstat (limited to 'indra/newview/llgroupactions.cpp')
-rw-r--r-- | indra/newview/llgroupactions.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llgroupactions.cpp b/indra/newview/llgroupactions.cpp index 24ae90e3ae..58cb1a614d 100644 --- a/indra/newview/llgroupactions.cpp +++ b/indra/newview/llgroupactions.cpp @@ -248,7 +248,7 @@ void LLGroupActions::startCall(const LLUUID& group_id) return; } - LLUUID session_id = gIMMgr->addSession(gdata.mName, IM_SESSION_GROUP_START, group_id, true); + LLUUID session_id = gIMMgr->addSession(gdata.mName, IM_SESSION_GROUP_START, group_id, LLSD()); if (session_id == LLUUID::null) { LL_WARNS() << "Error adding session" << LL_ENDL; @@ -370,8 +370,8 @@ void LLGroupActions::processLeaveGroupDataResponse(const LLUUID group_id) if (gdatap->mMembershipFee > 0) { args["COST"] = gdatap->mMembershipFee; - LLNotificationsUtil::add("GroupLeaveConfirmMember", args, payload, onLeaveGroup); - } + LLNotificationsUtil::add("GroupLeaveConfirmMember", args, payload, onLeaveGroup); +} else { LLNotificationsUtil::add("GroupLeaveConfirmMemberNoFee", args, payload, onLeaveGroup); |