diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-05-08 10:18:03 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-05-08 10:18:03 -0700 |
| commit | 60f602d5e12a50623b51b13e097992f79006823f (patch) | |
| tree | 386e3cf5b25f3292e3ba7c8a9b0524c5bfbb9589 /indra/newview/lluploaddialog.cpp | |
| parent | 29da931051202a10ea71db56e47acecae1603a5d (diff) | |
| parent | ccb86a2a6675b21dda6267d4a850e5a09acbafa4 (diff) | |
Pull from VirLinden/drano
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; |