diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2010-06-07 13:16:39 -0700 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2010-06-07 13:16:39 -0700 |
| commit | 09e1f88cc6a7dc0f52ad9d620a27cd54b4af021c (patch) | |
| tree | af6fb655a9dff65772855d1bf9d67b1f6acb0f01 /indra/llui/llurlregistry.cpp | |
| parent | 71f39136795609700a6eb46aad7b0f1397a860d0 (diff) | |
| parent | 474832b084891df42d731e6d48770b9e969d7b2a (diff) | |
Automated merge with ssh://hg.lindenlab.com/palange/viewer-2-0
Diffstat (limited to 'indra/llui/llurlregistry.cpp')
| -rw-r--r-- | indra/llui/llurlregistry.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/llui/llurlregistry.cpp b/indra/llui/llurlregistry.cpp index 4341286eb4..1f86f72faa 100644 --- a/indra/llui/llurlregistry.cpp +++ b/indra/llui/llurlregistry.cpp @@ -183,7 +183,8 @@ bool LLUrlRegistry::findUrl(const std::string &text, LLUrlMatch &match, const LL match_entry->getColor(), match_entry->getMenuName(), match_entry->getLocation(url), - match_entry->isLinkDisabled()); + match_entry->isLinkDisabled(), + match_entry->getID(url)); return true; } @@ -217,7 +218,8 @@ bool LLUrlRegistry::findUrl(const LLWString &text, LLUrlMatch &match, const LLUr match.getColor(), match.getMenuName(), match.getLocation(), - match.isLinkDisabled()); + match.isLinkDisabled(), + match.getID()); return true; } return false; |