diff options
| author | Aimee Linden <aimee@lindenlab.com> | 2010-09-03 15:30:16 +0100 |
|---|---|---|
| committer | Aimee Linden <aimee@lindenlab.com> | 2010-09-03 15:30:16 +0100 |
| commit | 0a74d1593513dc3209fdb29a8dc56b2794b36a29 (patch) | |
| tree | 1af644fe9ad3c62999c177ae37cbeff2ffe19d62 /indra/llui/llstyle.h | |
| parent | ce1a0c6bafad092f9687e3b5a6b4865569d96863 (diff) | |
| parent | 54b9992eaefe2b68d16a6264c1901f12612e99dc (diff) | |
Merge between james/viewer-identity-evolution and dessie/viewer-public
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 44d9da7a1e..0b0af427c3 100644 --- a/indra/llui/llstyle.h +++ b/indra/llui/llstyle.h @@ -52,6 +52,7 @@ public: Optional<const LLFontGL*> font; Optional<LLUIImage*> image; Optional<std::string> link_href; + Optional<bool> is_link; Params(); }; LLStyle(const Params& p = Params()); @@ -112,6 +113,7 @@ private: std::string mFontName; const LLFontGL* mFont; std::string mLink; + bool mIsLink; LLUIImagePtr mImagep; }; |