diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-03 19:27:15 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-03 19:27:15 +0000 |
| commit | 69a36cb5ce03d7631162117e471dc37bc8e8f4b6 (patch) | |
| tree | b7600112c0bd3dc33af759057d9b0c78bcc880b3 /indra/newview/llviewermessage.cpp | |
| parent | 78553cce481e0f05485033ff9a64d53d13893d97 (diff) | |
| parent | 917841120f8932af112896344c7f25be7bc32773 (diff) | |
PE merge.
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index e525561b7d..143d95d27e 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); |