diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-03-09 12:58:50 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-03-09 12:58:50 -0500 |
| commit | 633bd44b4a9dbf7f4f262929b28848e04b446b26 (patch) | |
| tree | dc3261611d5b07282c9a4210d49893be779c7d2a /indra/newview/lluploaddialog.cpp | |
| parent | 35dd27d5e57b2957aaa904cce841fccd4cfff850 (diff) | |
| parent | 1b624f5ea686292652978c72d39e5546efe23d0f (diff) | |
merge changes for vmrg-225
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; |