diff options
author | Jacek Antonelli | 2008-08-15 23:45:16 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:16 -0500 |
commit | 3f27ba891ac4d032753b219b4b96d1ffbc9fb488 (patch) | |
tree | 504932ee91a0356fba7ea48798887c96867e492f /linden/indra/newview/llviewerwindow.cpp | |
parent | Second Life viewer sources 1.18.4.3 (diff) | |
download | meta-impy-3f27ba891ac4d032753b219b4b96d1ffbc9fb488.zip meta-impy-3f27ba891ac4d032753b219b4b96d1ffbc9fb488.tar.gz meta-impy-3f27ba891ac4d032753b219b4b96d1ffbc9fb488.tar.bz2 meta-impy-3f27ba891ac4d032753b219b4b96d1ffbc9fb488.tar.xz |
Second Life viewer sources 1.18.5.0-RC
Diffstat (limited to 'linden/indra/newview/llviewerwindow.cpp')
-rw-r--r-- | linden/indra/newview/llviewerwindow.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/linden/indra/newview/llviewerwindow.cpp b/linden/indra/newview/llviewerwindow.cpp index 49abf13..7aaf9c0 100644 --- a/linden/indra/newview/llviewerwindow.cpp +++ b/linden/indra/newview/llviewerwindow.cpp | |||
@@ -32,9 +32,15 @@ | |||
32 | #include "llviewerprecompiledheaders.h" | 32 | #include "llviewerprecompiledheaders.h" |
33 | 33 | ||
34 | #include "llviewerwindow.h" | 34 | #include "llviewerwindow.h" |
35 | |||
36 | // system library includes | ||
37 | #include <stdio.h> | ||
38 | #include <iostream> | ||
39 | #include <fstream> | ||
40 | |||
35 | #include "llviewquery.h" | 41 | #include "llviewquery.h" |
36 | #include "llxmltree.h" | 42 | #include "llxmltree.h" |
37 | #include "llviewercamera.h" | 43 | //#include "llviewercamera.h" |
38 | //#include "imdebug.h" | 44 | //#include "imdebug.h" |
39 | 45 | ||
40 | #include "llvoiceclient.h" // for push-to-talk button handling | 46 | #include "llvoiceclient.h" // for push-to-talk button handling |
@@ -1823,6 +1829,8 @@ void LLViewerWindow::adjustRectanglesForFirstUse(const LLRect& window) | |||
1823 | adjust_rect_top_left("FloaterGestureRect", window); | 1829 | adjust_rect_top_left("FloaterGestureRect", window); |
1824 | 1830 | ||
1825 | adjust_rect_top_right("FloaterMapRect", window); | 1831 | adjust_rect_top_right("FloaterMapRect", window); |
1832 | |||
1833 | adjust_rect_top_right("FloaterLagMeter", window); | ||
1826 | 1834 | ||
1827 | adjust_rect_top_right("FloaterLagMeter", window); | 1835 | adjust_rect_top_right("FloaterLagMeter", window); |
1828 | 1836 | ||
@@ -2925,6 +2933,10 @@ BOOL LLViewerWindow::handlePerFrameHover() | |||
2925 | { | 2933 | { |
2926 | gFloaterTools->setVisible(FALSE); | 2934 | gFloaterTools->setVisible(FALSE); |
2927 | } | 2935 | } |
2936 | // In the future we may wish to hide the tools menu unless you | ||
2937 | // are building. JC | ||
2938 | //gMenuBarView->setItemVisible("Tools", gFloaterTools->getVisible()); | ||
2939 | //gMenuBarView->arrange(); | ||
2928 | } | 2940 | } |
2929 | if (gToolBar) | 2941 | if (gToolBar) |
2930 | { | 2942 | { |