diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-02-26 12:02:34 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-26 12:02:34 -0800 |
| commit | 13d4257868451d1e3a5797bd02a0e6f749cc0836 (patch) | |
| tree | bafaaa1220764a6f989f84cb434e82ef341a27c7 /indra/llui/llurlregistry.cpp | |
| parent | 2d7697dfade4ecbb8fbe9b26a5332fc9e93f5669 (diff) | |
| parent | fc70ca5403acdd99b2235dbf4e513a4dd806c850 (diff) | |
automated 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) |