summaryrefslogtreecommitdiff
path: root/indra/llui/llurlentry.cpp
diff options
context:
space:
mode:
authorLogan Dethrow <log@lindenlab.com>2011-08-18 17:52:00 -0400
committerLogan Dethrow <log@lindenlab.com>2011-08-18 17:52:00 -0400
commitce0b04889d3d02d1d1eabe84a566a641db1e2d8e (patch)
treef9501fe5624d4a0a40ce6e87fe2fb87ae2d4f476 /indra/llui/llurlentry.cpp
parent4fb809eed5fbed458b5be883fba7196a5712aa48 (diff)
parentb2ef0f99882db73680cc5dfb9570255414f7ba6d (diff)
Merge.
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 a37f026844..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);
}