aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llui
diff options
context:
space:
mode:
authorMcCabe Maxsted2010-08-10 15:06:04 -0700
committerMcCabe Maxsted2010-08-10 15:06:04 -0700
commit463ccc12fa763f70c5392b89a2ec6cd9d68c40a9 (patch)
treee722266dea733690b7fa759754059161fb77cf2b /linden/indra/llui
parentAdded meta7windlight.h file to CMake (diff)
downloadmeta-impy-463ccc12fa763f70c5392b89a2ec6cd9d68c40a9.zip
meta-impy-463ccc12fa763f70c5392b89a2ec6cd9d68c40a9.tar.gz
meta-impy-463ccc12fa763f70c5392b89a2ec6cd9d68c40a9.tar.bz2
meta-impy-463ccc12fa763f70c5392b89a2ec6cd9d68c40a9.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')
-rw-r--r--linden/indra/llui/lltexteditor.cpp6
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://";