diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-11-04 18:09:35 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-11-04 18:09:35 -0700 |
| commit | ba3307b8d0f2ceb40454174a6593f3f98ce98b65 (patch) | |
| tree | 7c016ab72795543361d206de5344b34a6a823fdf /indra/llui/llstyle.cpp | |
| parent | dac53830f1a67c8657ced9c39eccedbadf149bd9 (diff) | |
| parent | 40979589afc5c91cab977307a1e400315b1c8a8f (diff) | |
merge with STORM-105
Diffstat (limited to 'indra/llui/llstyle.cpp')
| -rw-r--r-- | indra/llui/llstyle.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/llui/llstyle.cpp b/indra/llui/llstyle.cpp index 5e09cee78b..28a064e6b6 100644 --- a/indra/llui/llstyle.cpp +++ b/indra/llui/llstyle.cpp @@ -40,7 +40,8 @@ LLStyle::Params::Params() selected_color("selected_color", LLColor4::black), font("font", LLFontGL::getFontMonospace()), image("image"), - link_href("href") + link_href("href"), + is_link("is_link") {} @@ -51,6 +52,7 @@ LLStyle::LLStyle(const LLStyle::Params& p) mSelectedColor(p.selected_color), mFont(p.font()), mLink(p.link_href), + mIsLink(p.is_link.isProvided() ? p.is_link : !p.link_href().empty()), mDropShadow(p.drop_shadow), mImagep(p.image()) {} @@ -73,7 +75,7 @@ void LLStyle::setLinkHREF(const std::string& href) BOOL LLStyle::isLink() const { - return mLink.size(); + return mIsLink; } BOOL LLStyle::isVisible() const |