diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-02-03 17:32:57 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-02-03 17:32:57 +0200 |
| commit | 11228d4b7d6be72759625e604fc09bade3cd306e (patch) | |
| tree | 6865dda1aff6668d8c3038415e81210b285c4c59 /indra/llui/llurlregistry.cpp | |
| parent | 11f732bbbe910c2a63efaeb9044d206142d69e2f (diff) | |
| parent | 8cbea388eaad8b40faa604f9d7fa2a64570548e2 (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/llui/llurlregistry.cpp')
| -rw-r--r-- | indra/llui/llurlregistry.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/llurlregistry.cpp b/indra/llui/llurlregistry.cpp index 55eb8950e9..722dbe41b3 100644 --- a/indra/llui/llurlregistry.cpp +++ b/indra/llui/llurlregistry.cpp @@ -132,7 +132,8 @@ static bool stringHasUrl(const std::string &text) text.find(".com") != std::string::npos || text.find(".net") != std::string::npos || text.find(".edu") != std::string::npos || - text.find(".org") != std::string::npos); + text.find(".org") != std::string::npos || + text.find("<nolink>") != std::string::npos); } bool LLUrlRegistry::findUrl(const std::string &text, LLUrlMatch &match, const LLUrlLabelCallback &cb) |