summaryrefslogtreecommitdiff
path: root/indra/llui/llurlentry.cpp
diff options
context:
space:
mode:
authorNyx (Neal Orman) <nyx@lindenlab.com>2011-08-16 17:52:25 -0400
committerNyx (Neal Orman) <nyx@lindenlab.com>2011-08-16 17:52:25 -0400
commit1f97cca85678a8b79d718aeb2de8590eb3865076 (patch)
treefb8d9eace43b1e42775efacb0a6e44465e65a39f /indra/llui/llurlentry.cpp
parent53187303436d06038e40c5938219863c0d75ae5f (diff)
parent0301feb80bbf23d65cfd1ddbe22f297c3ff61a48 (diff)
merging latest mesh-development.
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 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);
}