diff options
author | David Seikel | 2011-04-04 03:00:08 +1000 |
---|---|---|
committer | David Seikel | 2011-04-04 03:00:08 +1000 |
commit | 198cbcf24e4dfc6956ca418fd6529dc24ac35d5b (patch) | |
tree | a133001cb2b4c1b1abd15e8d1a53be71ef19c807 /linden/indra/newview | |
parent | Combine the three ways of entering the users name on the login window. (diff) | |
download | meta-impy-198cbcf24e4dfc6956ca418fd6529dc24ac35d5b.zip meta-impy-198cbcf24e4dfc6956ca418fd6529dc24ac35d5b.tar.gz meta-impy-198cbcf24e4dfc6956ca418fd6529dc24ac35d5b.tar.bz2 meta-impy-198cbcf24e4dfc6956ca418fd6529dc24ac35d5b.tar.xz |
Shift the console up by a magic number to not cover the login panel.
A tiny, but annoying bug, that proved to be hard to track down.
Diffstat (limited to 'linden/indra/newview')
-rw-r--r-- | linden/indra/newview/llviewerwindow.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/linden/indra/newview/llviewerwindow.cpp b/linden/indra/newview/llviewerwindow.cpp index e6e8a97..868094e 100644 --- a/linden/indra/newview/llviewerwindow.cpp +++ b/linden/indra/newview/llviewerwindow.cpp | |||
@@ -2845,6 +2845,7 @@ BOOL LLViewerWindow::handlePerFrameHover() | |||
2845 | } | 2845 | } |
2846 | // In the future we may wish to hide the tools menu unless you | 2846 | // In the future we may wish to hide the tools menu unless you |
2847 | // are building. JC | 2847 | // are building. JC |
2848 | // I think the users generally told LL to get fucked on that silly idea. Pfffft | ||
2848 | //gMenuBarView->setItemVisible("Tools", gFloaterTools->getVisible()); | 2849 | //gMenuBarView->setItemVisible("Tools", gFloaterTools->getVisible()); |
2849 | //gMenuBarView->arrange(); | 2850 | //gMenuBarView->arrange(); |
2850 | } | 2851 | } |
@@ -2917,7 +2918,9 @@ BOOL LLViewerWindow::handlePerFrameHover() | |||
2917 | 2918 | ||
2918 | // Always update console | 2919 | // Always update console |
2919 | LLRect console_rect = getChatConsoleRect(); | 2920 | LLRect console_rect = getChatConsoleRect(); |
2920 | console_rect.mBottom = gHUDView->getRect().mBottom + getChatConsoleBottomPad(); | 2921 | // Add a magic number so the pre login console does not cover the login panel. |
2922 | // TODO: Would be nice to only do this for the pre login window. | ||
2923 | console_rect.mBottom = gHUDView->getRect().mBottom + getChatConsoleBottomPad() + 20; | ||
2921 | gConsole->reshape(console_rect.getWidth(), console_rect.getHeight()); | 2924 | gConsole->reshape(console_rect.getWidth(), console_rect.getHeight()); |
2922 | gConsole->setRect(console_rect); | 2925 | gConsole->setRect(console_rect); |
2923 | } | 2926 | } |