diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-02-26 17:34:39 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-26 17:34:39 -0800 |
| commit | 5352954eb65076d877cc74d4328620e910b93d1c (patch) | |
| tree | a8bf1c956c0de44a5ab7eb0a2a05d5e9ed29b751 /indra/newview/llviewermessage.cpp | |
| parent | 13d4257868451d1e3a5797bd02a0e6f749cc0836 (diff) | |
| parent | b1891e2982cc03ccd695eae82989d3e58695616c (diff) | |
automated 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 e437f5bc69..8a5e37d90a 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); |