diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-02 17:28:55 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-02 17:28:55 +0000 |
| commit | cb57f65f689fe98e0f7b2d9fdb4cd753c927a44c (patch) | |
| tree | c6eeb5af8bebe762a33751903ce96b99d84e4fd2 /indra/llui/llurlregistry.cpp | |
| parent | b6bc7d94f244597f3109f2332aa395f8b3623048 (diff) | |
| parent | f937153a01f1586e5345d8d08c5cba6cf806cde4 (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) |