summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVadim ProductEngine <vsavchuk@productengine.com>2011-08-12 16:32:47 +0300
committerVadim ProductEngine <vsavchuk@productengine.com>2011-08-12 16:32:47 +0300
commitba129fff471e50e671deabab62235d69144e341b (patch)
treed17b300d3e95e315c6ea5885163b0d8c1c45afc8
parentad0fcbc45cc4fbdbe6a3aa98dc7ea456206dd37e (diff)
STORM-632 ADDITIONAL_FIX Use non-greedy regexp match to enable multiple <nolink>...</nolink> clauses in a single textbox.
-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);
}