diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-06-24 19:37:35 -0400 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-06-24 19:37:35 -0400 |
commit | c77efc92e3ebcb9af9bb997e5b709484153844d4 (patch) | |
tree | 57f58946a62b16dc623d7469d59bef19f514d574 /indra/llui/llbutton.h | |
parent | 9f835b9bce6ac023a9f8b98cfb53015f5d416130 (diff) | |
parent | c6b80b47459711cc4c0b1971cb954ad6148517a0 (diff) |
automated merge
Diffstat (limited to 'indra/llui/llbutton.h')
-rw-r--r-- | indra/llui/llbutton.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llui/llbutton.h b/indra/llui/llbutton.h index d7ab030a47..f4af19b696 100644 --- a/indra/llui/llbutton.h +++ b/indra/llui/llbutton.h @@ -230,6 +230,8 @@ public: void setFont(const LLFontGL *font) { mGLFont = ( font ? font : LLFontGL::getFontSansSerif()); } + const LLFontGL* getFont() const { return mGLFont; } + S32 getLastDrawCharsCount() const { return mLastDrawCharsCount; } |