diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-04 10:51:49 +0000 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-04 10:51:49 +0000 |
commit | 87c986dc5809b71a7ee76438111a37838063cb18 (patch) | |
tree | 80771ab88e80db0d6b61485427fb7bcbf021d7b6 /indra/llui/llurlregistry.cpp | |
parent | 3614dc007328111462297e9244f370fb5f4a0910 (diff) | |
parent | 6d5442fbbd3adc9a708b894d402c9719f2dfa324 (diff) |
PE merge.
Diffstat (limited to 'indra/llui/llurlregistry.cpp')
-rw-r--r-- | indra/llui/llurlregistry.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llurlregistry.cpp b/indra/llui/llurlregistry.cpp index 722dbe41b3..faa02e1904 100644 --- a/indra/llui/llurlregistry.cpp +++ b/indra/llui/llurlregistry.cpp @@ -174,7 +174,7 @@ bool LLUrlRegistry::findUrl(const std::string &text, LLUrlMatch &match, const LL match.setValues(match_start, match_end, match_entry->getUrl(url), match_entry->getLabel(url, cb), - match_entry->getTooltip(), + match_entry->getTooltip(url), match_entry->getIcon(), match_entry->getColor(), match_entry->getMenuName(), |