summaryrefslogtreecommitdiff
path: root/indra/newview/llimprocessing.cpp
diff options
context:
space:
mode:
authorMnikolenko Productengine <mnikolenko@productengine.com>2025-12-08 18:52:37 +0200
committerMnikolenko Productengine <mnikolenko@productengine.com>2025-12-08 18:52:46 +0200
commitcbe606df6b77780fdecf8bdc4007a52d25ff5722 (patch)
tree2bf38de402b8c338bdf5dde5798dcf7d15d9a8da /indra/newview/llimprocessing.cpp
parent88a3d951fd15863bfd77b9b7137e9c02c21a4a10 (diff)
parent49c73ac7297ec7760a00bf36fa6339f2d0be1f95 (diff)
Merge branch 'release/2026.01' into maxim/voice-moderation
# Conflicts: # indra/newview/llviewerstats.h
Diffstat (limited to 'indra/newview/llimprocessing.cpp')
-rw-r--r--indra/newview/llimprocessing.cpp12
1 files changed, 11 insertions, 1 deletions
diff --git a/indra/newview/llimprocessing.cpp b/indra/newview/llimprocessing.cpp
index fe567ac7ec..779ed725ac 100644
--- a/indra/newview/llimprocessing.cpp
+++ b/indra/newview/llimprocessing.cpp
@@ -202,9 +202,19 @@ void inventory_offer_handler(LLOfferInfo* info)
auto indx = msg.find(" ( http://slurl.com/secondlife/");
if (indx == std::string::npos)
{
- // try to find new slurl host
+ // https
+ indx = msg.find(" ( https://slurl.com/secondlife/");
+ }
+ if (indx == std::string::npos)
+ {
+ // try to find new slurl http host
indx = msg.find(" ( http://maps.secondlife.com/secondlife/");
}
+ if (indx == std::string::npos)
+ {
+ // try to find new slurl https host
+ indx = msg.find(" ( https://maps.secondlife.com/secondlife/");
+ }
if (indx >= 0)
{
LLStringUtil::truncate(msg, indx);