diff options
| author | Eli Linden <eli@lindenlab.com> | 2010-03-04 11:21:14 -0800 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2010-03-04 11:21:14 -0800 |
| commit | 96fd9253490cd35dca314d7719529b886a3df3ae (patch) | |
| tree | 87207b5070f28ecdc8a38610d00c9c84e2bcb5f2 /indra/llui/llurlregistry.cpp | |
| parent | d0cd8f94db7e9ff5135b05c86fdccc007317d89a (diff) | |
| parent | 462a49fb9dcf9eb9f7d6b438bebabb7dc773c683 (diff) | |
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(), |