summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermessage.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-02-04 11:44:11 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-02-04 11:44:11 +0000
commit05e15ccb82541494bf7145652140de187d838cda (patch)
tree59e7772de3cd038bf1e1e222abbb7f0cdf315331 /indra/newview/llviewermessage.cpp
parent1805369b58d98677c726bb0bcb52618bd66e8fdd (diff)
parent56ca1aebb866b7d7e1526e31797dd7e07fcb74a8 (diff)
merge from viewer2.
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
-rw-r--r--indra/newview/llviewermessage.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 4f6f0f9dd6..7db8b51d18 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -1478,6 +1478,11 @@ void inventory_offer_handler(LLOfferInfo* info)
// 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);