summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorVadim ProductEngine <vsavchuk@productengine.com>2011-08-08 23:46:23 +0300
committerVadim ProductEngine <vsavchuk@productengine.com>2011-08-08 23:46:23 +0300
commitf695f8d1122e6db09f6d4ec50c930ba4f3c40805 (patch)
tree00b0ee09531fa03ecf1c7b189808c15021cb3326 /indra/llui
parent4ab5831b3eed23c06d2ccd3cf55f6c018613c788 (diff)
STORM-632 ADDITIONAL_FIX Disallow showing URL-like avatar display names as Web links in the ShareItemsConfirmation notification.
Updating the <nolink> tag parsing regexp to enable multiple <nolink>...</nolink> clauses in a single textbox.
Diffstat (limited to 'indra/llui')
-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..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);
}