diff options
author | Jacek Antonelli | 2008-08-15 23:45:34 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:34 -0500 |
commit | cd17687f01420952712a500107e0f93e7ab8d5f8 (patch) | |
tree | ce48c2b706f2c1176290e39fb555fbdf6648ce01 /linden/indra/newview/llconsole.cpp | |
parent | Second Life viewer sources 1.19.0.5 (diff) | |
download | meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.zip meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.gz meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.bz2 meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.xz |
Second Life viewer sources 1.19.1.0
Diffstat (limited to 'linden/indra/newview/llconsole.cpp')
-rw-r--r-- | linden/indra/newview/llconsole.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/llconsole.cpp b/linden/indra/newview/llconsole.cpp index 3a8765c..79ab8cc 100644 --- a/linden/indra/newview/llconsole.cpp +++ b/linden/indra/newview/llconsole.cpp | |||
@@ -94,8 +94,8 @@ void LLConsole::setLinePersistTime(F32 seconds) | |||
94 | 94 | ||
95 | void LLConsole::reshape(S32 width, S32 height, BOOL called_from_parent) | 95 | void LLConsole::reshape(S32 width, S32 height, BOOL called_from_parent) |
96 | { | 96 | { |
97 | S32 new_width = llmax(50, llmin(mRect.getWidth(), gViewerWindow->getWindowWidth())); | 97 | S32 new_width = llmax(50, llmin(getRect().getWidth(), gViewerWindow->getWindowWidth())); |
98 | S32 new_height = llmax(llfloor(mFont->getLineHeight()) + 15, llmin(mRect.getHeight(), gViewerWindow->getWindowHeight())); | 98 | S32 new_height = llmax(llfloor(mFont->getLineHeight()) + 15, llmin(getRect().getHeight(), gViewerWindow->getWindowHeight())); |
99 | 99 | ||
100 | LLView::reshape(new_width, new_height, called_from_parent); | 100 | LLView::reshape(new_width, new_height, called_from_parent); |
101 | } | 101 | } |
@@ -289,7 +289,7 @@ void LLConsole::addQueuedLines() | |||
289 | line_end = wline.size(); | 289 | line_end = wline.size(); |
290 | skip_chars = 0; | 290 | skip_chars = 0; |
291 | } | 291 | } |
292 | U32 drawable = mFont->maxDrawableChars(wline.c_str()+offset, (F32)mRect.getWidth(), line_end-offset, TRUE); | 292 | U32 drawable = mFont->maxDrawableChars(wline.c_str()+offset, (F32)getRect().getWidth(), line_end-offset, TRUE); |
293 | if (drawable != 0) | 293 | if (drawable != 0) |
294 | { | 294 | { |
295 | LLFixedBuffer::addLine(wline.substr(offset, drawable)); | 295 | LLFixedBuffer::addLine(wline.substr(offset, drawable)); |