summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-08-15 09:44:42 -0400
committerOz Linden <oz@lindenlab.com>2011-08-15 09:44:42 -0400
commitefd41378393d7580b609d91c9b750661baf009c4 (patch)
tree3e192f7f77336d8faf2c74a7bdf97696b0205644
parent91ac6b16f52e09aa93cb66ed6ead38496427d08c (diff)
parentba129fff471e50e671deabab62235d69144e341b (diff)
merge changes for storm-632
-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);
}