diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-04-14 05:39:36 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-04-14 05:39:36 -0400 |
| commit | 034fb74d05d25582ebdc086414cb0307b1e2e8e2 (patch) | |
| tree | d1c5e85e0f35782517921e1d80269cb23a511e97 /indra/llui/llurlentry.h | |
| parent | bef5a95cafdf6e20a243f4091b4fbcf426fb529b (diff) | |
| parent | 5a282abe184323643f1a88f2aba662648059b4e2 (diff) | |
merge changes for STORM-2113
Diffstat (limited to 'indra/llui/llurlentry.h')
| -rwxr-xr-x | indra/llui/llurlentry.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llurlentry.h b/indra/llui/llurlentry.h index ddfc33ab78..60a494974f 100755 --- a/indra/llui/llurlentry.h +++ b/indra/llui/llurlentry.h @@ -199,11 +199,11 @@ class LLUrlEntrySecondlifeURL : public LLUrlEntryBase { public: LLUrlEntrySecondlifeURL(); - bool isTrusted() const { return true; } + /*virtual*/ bool isTrusted() const { return true; } + /*virtual*/ std::string getUrl(const std::string &string) const; /*virtual*/ std::string getLabel(const std::string &url, const LLUrlLabelCallback &cb); /*virtual*/ std::string getQuery(const std::string &url) const; /*virtual*/ std::string getTooltip(const std::string &url) const; - /*virtual*/ std::string getUrl(const std::string &string) const; }; /// |