diff options
| author | Callum Prentice <callum@lindenlab.com> | 2014-06-16 13:22:19 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2014-06-16 13:22:19 -0700 |
| commit | f11dd1d8a3dc4ba9a3c23563126e11ee971e219f (patch) | |
| tree | cc2798f96eafb50f42d097da7ac53e152777c402 /indra/llui/llurlregistry.h | |
| parent | 483bd134162ffeef8760173aa223daee81c0f9e3 (diff) | |
| parent | 977476171ddcc057d7c28b6c14ae988b8189ed75 (diff) | |
Merge with head of viewer-release
Diffstat (limited to 'indra/llui/llurlregistry.h')
| -rwxr-xr-x | indra/llui/llurlregistry.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llui/llurlregistry.h b/indra/llui/llurlregistry.h index da16171a97..6270df1bbb 100755 --- a/indra/llui/llurlregistry.h +++ b/indra/llui/llurlregistry.h @@ -73,7 +73,8 @@ public: /// 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 bool findUrl(const std::string &text, LLUrlMatch &match, - const LLUrlLabelCallback &cb = &LLUrlRegistryNullCallback); + const LLUrlLabelCallback &cb = &LLUrlRegistryNullCallback, + bool is_content_trusted = false); /// a slightly less efficient version of findUrl for wide strings bool findUrl(const LLWString &text, LLUrlMatch &match, @@ -92,6 +93,7 @@ private: friend class LLSingleton<LLUrlRegistry>; std::vector<LLUrlEntryBase *> mUrlEntry; + LLUrlEntryBase* mUrlEntryIcon; }; #endif |