diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-03-10 16:20:09 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-03-10 16:20:09 -0700 |
| commit | 5690becdf4743286b196a331c48c8aa0332a8c66 (patch) | |
| tree | 7c64dba5dca5ccfc9631f92fa7d662257654137b /indra/llui/llurlaction.h | |
| parent | 807fa3ee06cc139fcc41f69ed2caac20a8e8370d (diff) | |
| parent | cb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff) | |
Pull merge from lindenlab/viewer-release
Diffstat (limited to 'indra/llui/llurlaction.h')
| -rwxr-xr-x | indra/llui/llurlaction.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llurlaction.h b/indra/llui/llurlaction.h index e731376b95..5f3626490c 100755 --- a/indra/llui/llurlaction.h +++ b/indra/llui/llurlaction.h @@ -66,7 +66,7 @@ public: static void showLocationOnMap(std::string url); /// perform the appropriate action for left-clicking on a Url - static void clickAction(std::string url); + static void clickAction(std::string url, bool trusted_content); /// copy the label for a Url to the clipboard static void copyLabelToClipboard(std::string url); @@ -86,7 +86,7 @@ public: /// specify the callbacks to enable this class's functionality typedef boost::function<void (const std::string&)> url_callback_t; - typedef boost::function<bool(const std::string& url)> execute_url_callback_t; + typedef boost::function<bool(const std::string& url, bool trusted_content)> execute_url_callback_t; static void setOpenURLCallback(url_callback_t cb); static void setOpenURLInternalCallback(url_callback_t cb); |