diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-07-02 13:03:57 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-07-02 19:01:48 +0300 |
| commit | 6f388f2276c4138f34b49ab630b0288c79ca4cec (patch) | |
| tree | f96e4fbd90a5f1ca7ac4e40c4fcb3f85ebaece6e /indra | |
| parent | 127f2b3994e91b1dd37a560e7d0328c4cfa7ec1c (diff) | |
SL-13540 Offline scripted inventory offers not shown on non drtsim-451
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llimprocessing.cpp | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/indra/newview/llimprocessing.cpp b/indra/newview/llimprocessing.cpp index 301b4c9214..5c9d53e0b9 100644 --- a/indra/newview/llimprocessing.cpp +++ b/indra/newview/llimprocessing.cpp @@ -865,6 +865,8 @@ void LLIMProcessing::processNewMessage(LLUUID from_id, { /*RIDER*/ // The previous version of the protocol returned the wrong binary bucket... we // still might be able to figure out the type... even though the offer is not retrievable. + + // Should be safe to remove once DRTSIM-451 fully deploys std::string str_bucket(reinterpret_cast<char *>(binary_bucket)); std::string str_type(str_bucket.substr(0, str_bucket.find('|'))); @@ -1575,8 +1577,6 @@ void LLIMProcessing::requestOfflineMessagesCoro(std::string url) LL_INFOS("Messaging") << "Processing offline messages." << LL_ENDL; -// std::vector<U8> data; -// S32 binary_bucket_size = 0; LLHost sender = gAgent.getRegionHost(); LLSD::array_iterator i = messages.beginArray(); @@ -1608,11 +1608,22 @@ void LLIMProcessing::requestOfflineMessagesCoro(std::string url) bin_bucket.push_back(0); } + // Todo: once drtsim-451 releases, remove the string option
+ BOOL from_group;
+ if (message_data["from_group"].isInteger())
+ {
+ from_group = message_data["from_group"].asInteger();
+ }
+ else
+ {
+ from_group = message_data["from_group"].asString() == "Y";
+ } + LLIMProcessing::processNewMessage( message_data["from_agent_id"].asUUID(), - message_data["from_group"].asBoolean(), + from_group, message_data["to_agent_id"].asUUID(), - static_cast<U8>(message_data["offline"].asInteger()), + 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(), static_cast<U32>(message_data["timestamp"].asInteger()), |