diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-08-18 20:23:57 +0000 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-08-18 20:23:57 +0000 |
| commit | c2c5e672e25d3272db0b062c3831abded6db9141 (patch) | |
| tree | fa6ba40f4609073d96f20460fcc8e38f8b8e1bf7 /indra/newview/llimprocessing.cpp | |
| parent | 456968de657f17de4757e95b87350b2564e54f71 (diff) | |
| parent | 4e94745139ea116b1779035e1b303a9fcc92f315 (diff) | |
Merged in DV510-merge-6.4.8 (pull request #243)
Merge master 6.4.8 into DRTVWR-510
Diffstat (limited to 'indra/newview/llimprocessing.cpp')
| -rw-r--r-- | indra/newview/llimprocessing.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/indra/newview/llimprocessing.cpp b/indra/newview/llimprocessing.cpp index 7b87b43243..e1b58dde51 100644 --- a/indra/newview/llimprocessing.cpp +++ b/indra/newview/llimprocessing.cpp @@ -1606,16 +1606,17 @@ 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";
+ // 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(), |