summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2011-08-15 14:51:21 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2011-08-15 14:51:21 -0400
commit832d972fe86325bfafad542c7c548dbecaf5ee65 (patch)
tree85d0a25e92646ebbc8f0cf5ee02da13573334233 /indra/llui
parent5c0df02df5abdadbf17235ae5d7208963c25f1ce (diff)
parentb21e63cc1260b1b8db87f52fb9b7a2f80b055327 (diff)
merge
Diffstat (limited to 'indra/llui')
-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 9db1feafd1..a9e8fbb4e4 100644
--- a/indra/llui/llurlentry.cpp
+++ b/indra/llui/llurlentry.cpp
@@ -1134,7 +1134,7 @@ std::string LLUrlEntryWorldMap::getLocation(const std::string &url) const
//
LLUrlEntryNoLink::LLUrlEntryNoLink()
{
- mPattern = boost::regex("<nolink>.*</nolink>",
+ mPattern = boost::regex("<nolink>.*?</nolink>",
boost::regex::perl|boost::regex::icase);
}