diff options
| author | Ptolemy <ptolemy@lindenlab.com> | 2020-05-06 09:43:25 -0700 |
|---|---|---|
| committer | Ptolemy <ptolemy@lindenlab.com> | 2020-05-06 09:43:25 -0700 |
| commit | cabbc19e95707400a7632498296cc1012b34bb0f (patch) | |
| tree | 00a1fc15e9fd2c2ee742951967cf37eff22ee47a /indra/newview/llimprocessing.cpp | |
| parent | 7bf2a1f5fef557e4531731c608c8dd924c97bc39 (diff) | |
| parent | 7449f4b6d770be9d56ee5fa3d20b6b59d816719c (diff) | |
DRTVWR-510: Fix merge conflict
Diffstat (limited to 'indra/newview/llimprocessing.cpp')
| -rw-r--r-- | indra/newview/llimprocessing.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llimprocessing.cpp b/indra/newview/llimprocessing.cpp index c3375a3779..6da7bbe263 100644 --- a/indra/newview/llimprocessing.cpp +++ b/indra/newview/llimprocessing.cpp @@ -1579,7 +1579,7 @@ void LLIMProcessing::requestOfflineMessagesCoro(std::string url) std::vector<U8> data; S32 binary_bucket_size = 0; - LLHost sender = gAgent.getRegion()->getHost(); + LLHost sender = gAgent.getRegionHost(); LLSD::array_iterator i = messages.beginArray(); LLSD::array_iterator iEnd = messages.endArray(); |