diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-06-20 20:44:44 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-06-20 20:45:48 +0300 |
| commit | 5c420babdcceafbe8ecfd786f37ece5d0581714d (patch) | |
| tree | d5b65e82c6c18014eba9eef4693a4ff2f83dd834 /indra/newview | |
| parent | ff005a0c2a6ff1d40a3823f506e0bcff963e0aa8 (diff) | |
SL-19860 Fixed messages from muted objects being shown upon login
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llimprocessing.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/indra/newview/llimprocessing.cpp b/indra/newview/llimprocessing.cpp index 3536b83989..948793681d 100644 --- a/indra/newview/llimprocessing.cpp +++ b/indra/newview/llimprocessing.cpp @@ -1631,14 +1631,19 @@ void LLIMProcessing::requestOfflineMessagesCoro(std::string url) from_group = message_data["from_group"].asString() == "Y"; } - + EInstantMessage dialog = static_cast<EInstantMessage>(message_data["dialog"].asInteger()); + LLUUID session_id = message_data["transaction-id"].asUUID(); + if (session_id.isNull() && dialog == IM_FROM_TASK) + { + session_id = message_data["asset_id"].asUUID(); + } LLIMProcessing::processNewMessage( message_data["from_agent_id"].asUUID(), from_group, message_data["to_agent_id"].asUUID(), message_data.has("offline") ? static_cast<U8>(message_data["offline"].asInteger()) : IM_OFFLINE, - static_cast<EInstantMessage>(message_data["dialog"].asInteger()), - message_data["transaction-id"].asUUID(), + dialog, + session_id, static_cast<U32>(message_data["timestamp"].asInteger()), message_data["from_agent_name"].asString(), message_data["message"].asString(), |