diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-02-02 17:15:46 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-02-02 17:15:46 -0500 |
| commit | f22fc1e6129a7e56421a0777d69c64265d9ec4af (patch) | |
| tree | 43dc78b1795ef407db7b9124472626fa77ae6621 /indra/llui/llurlregistry.cpp | |
| parent | 847a3a12208359653aa7432f7f64c31669ec8963 (diff) | |
| parent | e3344abb95802646912f357d214538966f3f2357 (diff) | |
automated merge viewer2.0->viewer2.0
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) |