diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-03-04 15:31:35 -0500 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-03-04 15:31:35 -0500 |
commit | f8916165f95606503b37eff7177674a57fe5d73e (patch) | |
tree | 48906e70ba957772add46945e755a525ab563c51 /indra/llui/llurlentry.h | |
parent | 2a60fdb1978de9dbe5b18ea3be9009ffc907eedd (diff) | |
parent | b35ffd530488f0411dfc257e023a1b00c1c38eec (diff) |
automated merge viewer2.0->viewer2.0
Diffstat (limited to 'indra/llui/llurlentry.h')
-rw-r--r-- | indra/llui/llurlentry.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/llurlentry.h b/indra/llui/llurlentry.h index 3abada0f24..c947ef7259 100644 --- a/indra/llui/llurlentry.h +++ b/indra/llui/llurlentry.h @@ -83,7 +83,7 @@ public: LLUIColor getColor() const { return mColor; } /// Given a matched Url, return a tooltip string for the hyperlink - std::string getTooltip() const { return mTooltip; } + virtual std::string getTooltip(const std::string &string) const { return mTooltip; } /// Return the name of a XUI file containing the context menu items std::string getMenuName() const { return mMenuName; } @@ -257,6 +257,7 @@ public: LLUrlEntrySLLabel(); /*virtual*/ std::string getLabel(const std::string &url, const LLUrlLabelCallback &cb); /*virtual*/ std::string getUrl(const std::string &string) const; + /*virtual*/ std::string getTooltip(const std::string &string) const; }; /// |