diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-03-04 15:31:35 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-03-04 15:31:35 -0500 |
| commit | f8916165f95606503b37eff7177674a57fe5d73e (patch) | |
| tree | 48906e70ba957772add46945e755a525ab563c51 /indra/llui/llurlregistry.cpp | |
| parent | 2a60fdb1978de9dbe5b18ea3be9009ffc907eedd (diff) | |
| parent | b35ffd530488f0411dfc257e023a1b00c1c38eec (diff) | |
automated merge viewer2.0->viewer2.0
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(), |