diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-06-03 14:40:10 -0400 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-06-03 14:40:10 -0400 |
commit | a3246a301623f80edb109391c851774cf459fbe8 (patch) | |
tree | 57dce21a2e37eb9f9770dda9ef01a36c064cf561 /indra/llui/llurlregistry.cpp | |
parent | 4f95701895a07066d5b46649d720335da1b62e71 (diff) | |
parent | 797c1dbc6ef1c51755dcace98caf0c493cd8f511 (diff) |
automated merge
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; |