summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorLogan Dethrow <log@lindenlab.com>2011-08-12 14:24:00 -0400
committerLogan Dethrow <log@lindenlab.com>2011-08-12 14:24:00 -0400
commitf73ec6a0378bb31500957e2e9d29ce9c48796831 (patch)
tree3dfac26b35957d7ba1f2668f26183544353ce3a5 /indra/llui
parentcff5251f064005f213a905f6eb41b5b7ef8c954b (diff)
parenta41e149642bba39a5dc9bae01a0ea3e6455f7471 (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..a37f026844 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);
}