diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-03-01 13:31:17 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-03-01 13:31:17 -0800 |
| commit | 24789f11cc58cf7c03283a8e9648085a5cb9d7d8 (patch) | |
| tree | bade7e21ca009bdb6a9f89b155732876bb02035d /indra/newview/llviewertexteditor.cpp | |
| parent | a7499dc4abfa5fa7582dc7ebb535a07ed94d0c4f (diff) | |
| parent | 66f101bac591d82b71ab7dc976b6fed0ed451909 (diff) | |
Pull from viewer-experience
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; } |