Applied patch for SNOW-636: parse links to maps.secondlife.com in chat as slurls (viewer2 slurl format)

1 files changed, 5 insertions, 0 deletions

diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 9bd11e8..fb1e7cf 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -1295,6 +1295,11 @@ void inventory_offer_handler(LLOfferInfo* info, BOOL from_task)
         // Strip any SLURL from the message display. (DEV-2754)
         std::string msg = info->mDesc;
         int indx = msg.find(" ( http://slurl.com/secondlife/");
+        if(indx == std::string::npos)
+        {
+                // try to find new slurl host
+                indx = msg.find(" ( http://maps.secondlife.com/secondlife/");
+        }
         if(indx >= 0)
         {
                 LLStringUtil::truncate(msg, indx);