diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-05-08 15:51:56 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-05-08 15:51:56 -0400 |
| commit | 95090c5d1e857130f7266b5753d3650d02e9386c (patch) | |
| tree | cff60656371883829dd7451ed4a1d3d09258b5ae /indra/newview/llviewertexteditor.cpp | |
| parent | 5bf742895d882f1d7178c2b18a347bf485877a02 (diff) | |
| parent | d6569db3520f7e0ce2d93febb6f4e26b48c08a3d (diff) | |
merge changes for version 3.3.1
Diffstat (limited to 'indra/newview/llviewertexteditor.cpp')
| -rw-r--r-- | indra/newview/llviewertexteditor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewertexteditor.cpp b/indra/newview/llviewertexteditor.cpp index b41ed00f17..99102309a1 100644 --- a/indra/newview/llviewertexteditor.cpp +++ b/indra/newview/llviewertexteditor.cpp @@ -187,7 +187,7 @@ public: else { width = EMBEDDED_ITEM_LABEL_PADDING + mImage->getWidth() + mStyle->getFont()->getWidth(mLabel.c_str()); - height = llmax(mImage->getHeight(), llceil(mStyle->getFont()->getLineHeight())); + height = llmax(mImage->getHeight(), mStyle->getFont()->getLineHeight()); } return false; } |