diff options
author | Aimee Linden <aimee@lindenlab.com> | 2010-09-03 17:41:39 +0100 |
---|---|---|
committer | Aimee Linden <aimee@lindenlab.com> | 2010-09-03 17:41:39 +0100 |
commit | ffae589843c2977ae7f70de78d84c936e2a91291 (patch) | |
tree | 497660a88fe55382639dea1b2f3499241127470d /indra/llui/llurlregistry.h | |
parent | 63f2ddf377fa0fc6a666cdc1001289335d86258b (diff) | |
parent | 25c29d59cf658acec5901c6f06775add10cf0bfd (diff) |
Post-convert merge by convert_monolith.py from /Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution
Diffstat (limited to 'indra/llui/llurlregistry.h')
-rw-r--r-- | indra/llui/llurlregistry.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/llui/llurlregistry.h b/indra/llui/llurlregistry.h index 24ce516c43..da16171a97 100644 --- a/indra/llui/llurlregistry.h +++ b/indra/llui/llurlregistry.h @@ -37,7 +37,9 @@ #include <vector> /// This default callback for findUrl() simply ignores any label updates -void LLUrlRegistryNullCallback(const std::string &url, const std::string &label); +void LLUrlRegistryNullCallback(const std::string &url, + const std::string &label, + const std::string &icon); /// /// LLUrlRegistry is a singleton that contains a set of Url types that @@ -64,7 +66,9 @@ public: ~LLUrlRegistry(); /// add a new Url handler to the registry (will be freed on destruction) - void registerUrl(LLUrlEntryBase *url); + /// optionally force it to the front of the list, making it take + /// priority over other regular expression matches for URLs + void registerUrl(LLUrlEntryBase *url, bool force_front = false); /// get the next Url in an input string, starting at a given character offset /// your callback is invoked if the matched Url's label changes in the future |