diff options
| author | Callum Prentice <callum@gmail.com> | 2017-06-08 15:36:42 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@gmail.com> | 2017-06-08 15:36:42 -0700 |
| commit | 07185d300d7879fc4d8d268210fa2c440efe02f4 (patch) | |
| tree | 761fcb3e968339bc04882ea591f56af2fb175187 /indra/newview/llviewertexteditor.cpp | |
| parent | 8d36da00c885f31739ce6bf6dbc162a6ef3a15a1 (diff) | |
| parent | cf5865c6e2b27918b526431ccc4309bfc702534e (diff) | |
Automated merge with head of lindenlab/viewer64
Diffstat (limited to 'indra/newview/llviewertexteditor.cpp')
| -rw-r--r-- | indra/newview/llviewertexteditor.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewertexteditor.cpp b/indra/newview/llviewertexteditor.cpp index 9e09971ced..7d2d6e25c7 100644 --- a/indra/newview/llviewertexteditor.cpp +++ b/indra/newview/llviewertexteditor.cpp @@ -176,7 +176,7 @@ public: mToolTip = inv_item->getName() + '\n' + inv_item->getDescription(); } - /*virtual*/ bool getDimensions(S32 first_char, S32 num_chars, S32& width, S32& height) const + /*virtual*/ bool getDimensionsF32(S32 first_char, S32 num_chars, F32& width, S32& height) const { if (num_chars == 0) { @@ -185,7 +185,7 @@ public: } else { - width = EMBEDDED_ITEM_LABEL_PADDING + mImage->getWidth() + mStyle->getFont()->getWidth(mLabel.c_str()); + width = EMBEDDED_ITEM_LABEL_PADDING + mImage->getWidth() + mStyle->getFont()->getWidthF32(mLabel.c_str()); height = llmax(mImage->getHeight(), mStyle->getFont()->getLineHeight()); } return false; |