From f4c1e2e795f17ff57b75b774c02b5c9bb1c53901 Mon Sep 17 00:00:00 2001
From: Roxie Linden <roxie@lindenlab.com>
Date: Mon, 4 Mar 2024 15:23:20 -0800
Subject: Pass invitation type (p2p/group/adhoc) around
---
indra/newview/llimview.cpp | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index a675c44274..43edaf3589 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -87,6 +87,16 @@ const S32 XL8_PADDING = 3; // XL8_START_TAG.size() + XL8_END_TAG.size()
/** Timeout of outgoing session initialization (in seconds) */
const static U32 SESSION_INITIALIZATION_TIMEOUT = 30;
+
+enum EMultiAgentChatSessionType
+{
+ GROUP_CHAT_SESSION = 0,
+ CONFERENCE_SESSION = 1,
+ P2P_CHAT_SESSION = 2,
+ SESSION_TYPE_COUNT
+};
+
+
void startConferenceCoro(std::string url, LLUUID tempSessionId, LLUUID creatorId, LLUUID otherParticipantId, LLSD agents);
void startP2PCoro(std::string url, LLUUID tempSessionId, LLUUID creatorId, LLUUID otherParticipantId);
@@ -2078,7 +2088,7 @@ bool LLIMModel::sendStartSession(
return true;
}
- else if ((dialog == IM_SESSION_CONFERENCE_START ) || p2p_as_adhoc_call)
+ else if (dialog == IM_SESSION_CONFERENCE_START )
{
LLSD agents;
for (int i = 0; i < (S32) ids.size(); i++)
@@ -4100,8 +4110,8 @@ public:
return;
}
- BOOL session_type_p2p = input["body"]["voice"].get("p2p").asBoolean();
-
+ BOOL session_type_p2p = input["body"]["voice"].get("invitation_type").asInteger() == EMultiAgentChatSessionType::P2P_CHAT_SESSION;
+ LL_WARNS("Voice") << "VOICE DATA: " << input["body"]["voice"] << LL_ENDL;
gIMMgr->inviteToSession(
input["body"]["session_id"].asUUID(),
input["body"]["session_name"].asString(),
--
cgit v1.2.3