diff options
| author | Richard Linden <none@none> | 2012-01-27 19:55:16 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-01-27 19:55:16 -0800 |
| commit | 22a6170a7b19b3a6f44536b7552b633416348775 (patch) | |
| tree | c3dae0a64c8b4e5deea3dbfc50afb9e29d318d69 | |
| parent | cf02780ddf927a32214b3f4db050f516367d7421 (diff) | |
EXP-1513 FIX Underscore ( _ ) fails to show in first chat entry in Local Chat
| -rw-r--r-- | indra/llrender/llfontgl.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/widgets/tab_container.xml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp index a469581637..7d827ae483 100644 --- a/indra/llrender/llfontgl.cpp +++ b/indra/llrender/llfontgl.cpp @@ -219,10 +219,10 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, cons switch (valign) { case TOP: - cur_y -= mFontFreetype->getAscenderHeight(); + cur_y -= llceil(mFontFreetype->getAscenderHeight()); break; case BOTTOM: - cur_y += mFontFreetype->getDescenderHeight(); + cur_y += llceil(mFontFreetype->getDescenderHeight()); break; case VCENTER: cur_y -= (mFontFreetype->getAscenderHeight() - mFontFreetype->getDescenderHeight()) / 2.f; diff --git a/indra/newview/skins/default/xui/en/widgets/tab_container.xml b/indra/newview/skins/default/xui/en/widgets/tab_container.xml index 3e2202b20f..8f8126444d 100644 --- a/indra/newview/skins/default/xui/en/widgets/tab_container.xml +++ b/indra/newview/skins/default/xui/en/widgets/tab_container.xml @@ -11,7 +11,7 @@ label_pad_left - padding to the left of tab button labels halign="center" font="SansSerifSmall" tab_height="21" - label_pad_bottom="2" + label_pad_bottom="0" label_pad_left="4"> <!-- Possible additional attributes for tabs: |