diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-03-13 14:50:20 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-03-13 14:50:20 -0700 |
| commit | 629ec1d54d16549d42198a9ac83a33bb9b51ab22 (patch) | |
| tree | 2c1d558742f0d46c2277883de4de094dcabcb7f3 /indra/newview/lluploaddialog.cpp | |
| parent | 9aa0c58c20f8d60dc2f674ce1eaa805db8f599c8 (diff) | |
| parent | 1c812c3c6734197835fd8cfaef286f1ad444ec64 (diff) | |
Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-development-havokai.
Diffstat (limited to 'indra/newview/lluploaddialog.cpp')
| -rw-r--r-- | indra/newview/lluploaddialog.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lluploaddialog.cpp b/indra/newview/lluploaddialog.cpp index df7c5be0d6..e59064c074 100644 --- a/indra/newview/lluploaddialog.cpp +++ b/indra/newview/lluploaddialog.cpp @@ -115,7 +115,7 @@ void LLUploadDialog::setMessage( const std::string& msg) token = strtok( NULL, "\n" ); } - S32 line_height = S32( font->getLineHeight() + 0.99f ); + S32 line_height = font->getLineHeight(); S32 dialog_width = max_msg_width + 2 * HPAD; S32 dialog_height = line_height * msg_lines.size() + 2 * VPAD; |