diff options
author | Leyla Farazha <leyla@lindenlab.com> | 2010-10-14 14:03:16 -0700 |
---|---|---|
committer | Leyla Farazha <leyla@lindenlab.com> | 2010-10-14 14:03:16 -0700 |
commit | 508686047d5e98934d5fefbb576e54f108df6fe3 (patch) | |
tree | 6d751588cc200395d4fef41e61f4683a83a7ab86 /indra/llui/llstyle.h | |
parent | 2303ec6213ea7a591e0084e9fc9350b2afddd3c5 (diff) | |
parent | f53f6f20df5c99311103c3d92938ce878d474f13 (diff) |
Merge from http://hg.secondlife.com/viewer-identity (display names)
Diffstat (limited to 'indra/llui/llstyle.h')
-rw-r--r-- | indra/llui/llstyle.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llui/llstyle.h b/indra/llui/llstyle.h index 66cd639936..322edc343c 100644 --- a/indra/llui/llstyle.h +++ b/indra/llui/llstyle.h @@ -46,6 +46,7 @@ public: Optional<const LLFontGL*> font; Optional<LLUIImage*> image; Optional<std::string> link_href; + Optional<bool> is_link; Params(); }; LLStyle(const Params& p = Params()); @@ -106,6 +107,7 @@ private: std::string mFontName; const LLFontGL* mFont; std::string mLink; + bool mIsLink; LLUIImagePtr mImagep; }; |