diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-05-31 14:26:15 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-05-31 14:26:15 -0400 |
| commit | 925db41711bc319e870aa35f74b58f4e7a74420c (patch) | |
| tree | 69bac61403e5e432c073fb3e7ea29b6c3107a142 /indra/llrender/llfontgl.h | |
| parent | f09bd7669fcf976edf82c3ce70b26ea044019c67 (diff) | |
| parent | 5cad51594dc583c63bf88376feedb0b170868d3d (diff) | |
merge changes for storm-276
Diffstat (limited to 'indra/llrender/llfontgl.h')
| -rw-r--r-- | indra/llrender/llfontgl.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llrender/llfontgl.h b/indra/llrender/llfontgl.h index 74bdbb43e7..5ed5d2c4eb 100644 --- a/indra/llrender/llfontgl.h +++ b/indra/llrender/llfontgl.h @@ -115,6 +115,8 @@ public: S32 renderUTF8(const std::string &text, S32 begin_offset, S32 x, S32 y, const LLColor4 &color, HAlign halign, VAlign valign, U8 style = NORMAL, ShadowType shadow = NO_SHADOW) const; // font metrics - override for LLFontFreetype that returns units of virtual pixels + F32 getAscenderHeight() const; + F32 getDescenderHeight() const; S32 getLineHeight() const; S32 getWidth(const std::string& utf8text) const; |