summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorKyle Ambroff <ambroff@lindenlab.com>2010-10-25 11:27:29 -0700
committerKyle Ambroff <ambroff@lindenlab.com>2010-10-25 11:27:29 -0700
commit4b49b0eff79c41060ba53d0d33ff83b4c18e277b (patch)
treeae40206e0922d03346399ea2fe89a7f0327bc22b /indra/llui
parent7be4f43d1704a5d5318e4fd32ab95a132cd26ea3 (diff)
parentde6f7e19c44d267d3224c56941c2ab27677c406f (diff)
Merge with lindenlab/viewer-development
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 f58c07754f..f49dfec82b 100644
--- a/indra/llui/llurlentry.cpp
+++ b/indra/llui/llurlentry.cpp
@@ -972,7 +972,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);
}