summaryrefslogtreecommitdiff
path: root/indra/llui/llurlentry.cpp
diff options
context:
space:
mode:
authorMike Antipov <mantipov@productengine.com>2010-01-12 12:59:37 +0200
committerMike Antipov <mantipov@productengine.com>2010-01-12 12:59:37 +0200
commit94880f98fdcf3a2c7276e9f74f108ae35d9b3587 (patch)
tree665acec55ffa8aecb43da156c5045f5fc2bb3cf8 /indra/llui/llurlentry.cpp
parentbcb054970ce83fc613e1b6d163b3440457ca94d4 (diff)
parent3c3271761b918a19f7a10d80da9dd23e5127de2c (diff)
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
--HG-- branch : product-engine
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)