diff options
author | Oz Linden <oz@lindenlab.com> | 2018-06-21 15:31:21 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2018-06-21 15:31:21 -0400 |
commit | 3cdce9bf24ebac1c48b30955910a8f6b36797cb5 (patch) | |
tree | 5f731c4237dfe544e475c7d5f119aa2c6e8edcb8 /indra/llui/llurlentry.h | |
parent | c0e00cc61750d2b1bba3ada6622023df4725b1a4 (diff) | |
parent | dc07de2f4a4c49d1877bf743b6f0d209392f6eb6 (diff) |
merge changes for 5.1.6-release
Diffstat (limited to 'indra/llui/llurlentry.h')
-rw-r--r-- | indra/llui/llurlentry.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llui/llurlentry.h b/indra/llui/llurlentry.h index 28e9931718..78c149d9fd 100644 --- a/indra/llui/llurlentry.h +++ b/indra/llui/llurlentry.h @@ -175,6 +175,7 @@ class LLUrlEntrySLURL : public LLUrlEntryBase { public: LLUrlEntrySLURL(); + /*virtual*/ bool isTrusted() const { return true; } /*virtual*/ std::string getLabel(const std::string &url, const LLUrlLabelCallback &cb); /*virtual*/ std::string getLocation(const std::string &url) const; }; |