summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorLeslie Linden <leslie@lindenlab.com>2011-08-19 11:14:20 -0700
committerLeslie Linden <leslie@lindenlab.com>2011-08-19 11:14:20 -0700
commitcf4355851606c996ed8269ac709c8eaa5c9ccdef (patch)
treeaa465be3aeef1d70da09bc9bb37cc7f3ca4f185a /indra/llui
parent504fabba1d8d2ffd1d3c43368cbd1a8522ca2ebc (diff)
parente84f9acf761bd60a558682e87e053207bc9bc014 (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);
}