diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-11-01 22:02:35 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-11-01 22:02:35 +0000 |
| commit | 7afa8058aae0d5363cc19c7df1e6d2d7ec3bf7ac (patch) | |
| tree | 52f41bda3e57a58e968421212a8a48eead6f653d /indra/newview/llviewerwindow.cpp | |
| parent | 833e8d5c2a1dd48fd89b8b438dbe56572697bb76 (diff) | |
svn merge -r 72652:72881 svn+ssh://svn.lindenlab.com/svn/linden/branches/sl-search-11 --> release
QAR-11: pair-reviewed the merge w/ Sam.
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 49abf130ac..7aaf9c0652 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -32,9 +32,15 @@ #include "llviewerprecompiledheaders.h" #include "llviewerwindow.h" + +// system library includes +#include <stdio.h> +#include <iostream> +#include <fstream> + #include "llviewquery.h" #include "llxmltree.h" -#include "llviewercamera.h" +//#include "llviewercamera.h" //#include "imdebug.h" #include "llvoiceclient.h" // for push-to-talk button handling @@ -1823,6 +1829,8 @@ void LLViewerWindow::adjustRectanglesForFirstUse(const LLRect& window) adjust_rect_top_left("FloaterGestureRect", window); adjust_rect_top_right("FloaterMapRect", window); + + adjust_rect_top_right("FloaterLagMeter", window); adjust_rect_top_right("FloaterLagMeter", window); @@ -2925,6 +2933,10 @@ BOOL LLViewerWindow::handlePerFrameHover() { gFloaterTools->setVisible(FALSE); } + // In the future we may wish to hide the tools menu unless you + // are building. JC + //gMenuBarView->setItemVisible("Tools", gFloaterTools->getVisible()); + //gMenuBarView->arrange(); } if (gToolBar) { |