diff options
author | Dave Parks <davep@lindenlab.com> | 2013-04-02 11:18:29 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2013-04-02 11:18:29 -0500 |
commit | 3e8da4e8d5ec7a477db00de99ec4c75985c17094 (patch) | |
tree | a76d4b02258d9b2d3d12e7640a7a50830c007241 /indra/newview/lltoastscriptquestion.cpp | |
parent | 8f9ddc67fdcdf53313ae4217ffa551a5a157c765 (diff) | |
parent | 5f5732365b3c5a3b85fdc0be6fbbbbc0c2de01f2 (diff) |
Automated merge with https://bitbucket.org/lindenlab/davep-materials
Diffstat (limited to 'indra/newview/lltoastscriptquestion.cpp')
-rw-r--r-- | indra/newview/lltoastscriptquestion.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lltoastscriptquestion.cpp b/indra/newview/lltoastscriptquestion.cpp index feeb8ca77b..91ba8c0247 100644 --- a/indra/newview/lltoastscriptquestion.cpp +++ b/indra/newview/lltoastscriptquestion.cpp @@ -66,8 +66,8 @@ void LLToastScriptQuestion::snapToMessageHeight() if (mMessage->getVisible() && mFooter->getVisible()) { S32 heightDelta = 0; - S32 maxTextHeight = (mMessage->getDefaultFont()->getLineHeight() * MAX_LINES_COUNT) - + (mFooter->getDefaultFont()->getLineHeight() * MAX_LINES_COUNT); + S32 maxTextHeight = (mMessage->getFont()->getLineHeight() * MAX_LINES_COUNT) + + (mFooter->getFont()->getLineHeight() * MAX_LINES_COUNT); LLRect messageRect = mMessage->getRect(); LLRect footerRect = mFooter->getRect(); |