summaryrefslogtreecommitdiff
path: root/indra/llui/llurlentry.cpp
diff options
context:
space:
mode:
authorCallum Prentice <callum@lindenlab.com>2010-01-11 17:27:45 -0800
committerCallum Prentice <callum@lindenlab.com>2010-01-11 17:27:45 -0800
commit77565ce0c35fb35701bb51a82d70214a3ad56a12 (patch)
treedbbb8284e0db98bcc3db829a9d3192e86f924ea0 /indra/llui/llurlentry.cpp
parenta3ca95e3bd0e288792f6024d9487d618730fd40f (diff)
parenta74d494dd7c13e0307ee5ba526ba021583b1f2b5 (diff)
Merge with tip
Diffstat (limited to 'indra/llui/llurlentry.cpp')
-rw-r--r--indra/llui/llurlentry.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp
index f7528bc62a..1b6dd1b264 100644
--- a/indra/llui/llurlentry.cpp
+++ b/indra/llui/llurlentry.cpp
@@ -101,7 +101,7 @@ std::string LLUrlEntryBase::getLabelFromWikiLink(const std::string &url)
{
start++;
}
- return url.substr(start, url.size()-start-1);
+ return unescapeUrl(url.substr(start, url.size()-start-1));
}
std::string LLUrlEntryBase::getUrlFromWikiLink(const std::string &string)