diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-08-11 16:30:55 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-08-11 16:30:55 -0400 |
| commit | 3e47d9aea9193b6073ab8cfd67a16a101ffcbdc0 (patch) | |
| tree | 990ed2218ff27703a3aaeb9841a304029bcde90b /indra/llui | |
| parent | 4c0565f381e432453d4411678b0cc1bebf43f2e8 (diff) | |
| parent | ad0fcbc45cc4fbdbe6a3aa98dc7ea456206dd37e (diff) | |
merge changes for storm-632
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llurlentry.cpp | 2 |
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); } |