diff options
| author | Eli Linden <eli@lindenlab.com> | 2010-02-02 11:32:33 -0800 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2010-02-02 11:32:33 -0800 |
| commit | a4d81d0f6995ad52f3c0fc094d93f8652600abbd (patch) | |
| tree | 9fcc82ba3061423c971f56aa70b8447de2677237 /indra/llui/llurlregistry.cpp | |
| parent | 3fde73508e5b2fb5507b47d1f56d3fb47162b6fc (diff) | |
| parent | b90d1d0b6f60684ba2e97959c6a9d2df0ff8ec79 (diff) | |
Merge
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) |