diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-03 18:27:38 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-03 18:27:38 +0000 |
| commit | 75aec285349747b09077b576c7ec15838c4132f2 (patch) | |
| tree | a3591f4c94cad07c1a44337a03d12355a94378cd /indra/llui/llurlregistry.cpp | |
| parent | 7bb35543c1021c1a286a75684aeb5014eb104f4b (diff) | |
| parent | 594b1ac679a502f92db477e3f09441e361f72c93 (diff) | |
merge.
--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) |