summaryrefslogtreecommitdiff
path: root/indra/llui/llstyle.h
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2010-10-22 17:39:03 -0700
committerMerov Linden <merov@lindenlab.com>2010-10-22 17:39:03 -0700
commita0714f01804a2a2220bd72c3adf06f097ad21b73 (patch)
treedb304a8eca349020b48ae927fd8a534264a6ed83 /indra/llui/llstyle.h
parente3ecffc180ae50a0e8b726a061ec39cbe591326e (diff)
parentde6f7e19c44d267d3224c56941c2ab27677c406f (diff)
Merge with viewer-development
Diffstat (limited to 'indra/llui/llstyle.h')
-rw-r--r--indra/llui/llstyle.h2
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;
};