aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview
diff options
context:
space:
mode:
authorMcCabe Maxsted2012-02-18 02:12:39 -0700
committerMcCabe Maxsted2012-02-18 02:12:39 -0700
commitcb1f72c6c324811ece867a491626b3197aba0a69 (patch)
tree259745f98afb232290580897474376970cd0e80a /linden/indra/newview
parentFixed installer script still showing the quick launch option on Windows 7 (diff)
downloadmeta-impy-cb1f72c6c324811ece867a491626b3197aba0a69.zip
meta-impy-cb1f72c6c324811ece867a491626b3197aba0a69.tar.gz
meta-impy-cb1f72c6c324811ece867a491626b3197aba0a69.tar.bz2
meta-impy-cb1f72c6c324811ece867a491626b3197aba0a69.tar.xz
Applied patch by onefang for #975: chat console interferes with login controls when disable login screen is enabled
Diffstat (limited to 'linden/indra/newview')
-rw-r--r--linden/indra/newview/llviewerwindow.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/linden/indra/newview/llviewerwindow.cpp b/linden/indra/newview/llviewerwindow.cpp
index 2d20f63..380f524 100644
--- a/linden/indra/newview/llviewerwindow.cpp
+++ b/linden/indra/newview/llviewerwindow.cpp
@@ -2919,7 +2919,9 @@ BOOL LLViewerWindow::handlePerFrameHover()
2919 2919
2920 // Always update console 2920 // Always update console
2921 LLRect console_rect = getChatConsoleRect(); 2921 LLRect console_rect = getChatConsoleRect();
2922 console_rect.mBottom = gHUDView->getRect().mBottom + getChatConsoleBottomPad(); 2922 // Add a magic number so the pre login console does not cover the login panel.
2923 S32 magic_num = (LLStartUp::isLoggedIn()) ? 0 : 20;
2924 console_rect.mBottom = gHUDView->getRect().mBottom + getChatConsoleBottomPad() + magic_num;
2923 gConsole->reshape(console_rect.getWidth(), console_rect.getHeight()); 2925 gConsole->reshape(console_rect.getWidth(), console_rect.getHeight());
2924 gConsole->setRect(console_rect); 2926 gConsole->setRect(console_rect);
2925 } 2927 }