diff options
author | McCabe Maxsted | 2010-08-10 15:06:04 -0700 |
---|---|---|
committer | McCabe Maxsted | 2010-08-26 11:19:00 -0700 |
commit | b111e644416d8b9a28f1473b97cfc23d611099d9 (patch) | |
tree | b91ea07a9b11d8e4e8b23bf2df52762fffa545b2 /linden/indra/llui/lltexteditor.cpp | |
parent | Added meta7windlight.h file to CMake (diff) | |
download | meta-impy-b111e644416d8b9a28f1473b97cfc23d611099d9.zip meta-impy-b111e644416d8b9a28f1473b97cfc23d611099d9.tar.gz meta-impy-b111e644416d8b9a28f1473b97cfc23d611099d9.tar.bz2 meta-impy-b111e644416d8b9a28f1473b97cfc23d611099d9.tar.xz |
Applied patch for SNOW-636: parse links to maps.secondlife.com in chat as slurls (viewer2 slurl format)
Diffstat (limited to 'linden/indra/llui/lltexteditor.cpp')
-rw-r--r-- | linden/indra/llui/lltexteditor.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/linden/indra/llui/lltexteditor.cpp b/linden/indra/llui/lltexteditor.cpp index 00fa517..2d46943 100644 --- a/linden/indra/llui/lltexteditor.cpp +++ b/linden/indra/llui/lltexteditor.cpp | |||
@@ -4547,6 +4547,12 @@ BOOL LLTextEditor::findHTML(const std::string &line, S32 *begin, S32 *end) const | |||
4547 | std::string slurlID = "slurl.com/secondlife/"; | 4547 | std::string slurlID = "slurl.com/secondlife/"; |
4548 | strpos = url.find(slurlID); | 4548 | strpos = url.find(slurlID); |
4549 | 4549 | ||
4550 | if (strpos < 0) | ||
4551 | { | ||
4552 | slurlID="maps.secondlife.com/secondlife/"; | ||
4553 | strpos = url.find(slurlID); | ||
4554 | } | ||
4555 | |||
4550 | if (strpos < 0) | 4556 | if (strpos < 0) |
4551 | { | 4557 | { |
4552 | slurlID="secondlife://"; | 4558 | slurlID="secondlife://"; |