diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-05-13 08:47:24 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-05-13 08:47:24 -0400 |
| commit | 8f7a6f8312bf6325f408aee5173dd8aad19dab95 (patch) | |
| tree | fd68c639ac6720efc9cce6a4e76fb11ab97e5594 /indra/newview/llviewerwindow.cpp | |
| parent | 0859d38e9560bdc8af2a66a183f1540a0ab8a15e (diff) | |
| parent | f7a01d7b338bcd9c7ee09022a6179b3c6710237d (diff) | |
merge changes to improve build times
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index e020296842..7728958ed8 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -79,6 +79,7 @@ #include "lltooltip.h" #include "llmediaentry.h" #include "llurldispatcher.h" +#include "raytrace.h" // newview includes #include "llagent.h" @@ -234,17 +235,12 @@ BOOL gDisplayCameraPos = FALSE; BOOL gDisplayFOV = FALSE; BOOL gDisplayBadge = FALSE; -S32 CHAT_BAR_HEIGHT = 28; -S32 OVERLAY_BAR_HEIGHT = 20; - -const U8 NO_FACE = 255; +static const U8 NO_FACE = 255; BOOL gQuietSnapshot = FALSE; const F32 MIN_AFK_TIME = 2.f; // minimum time after setting away state before coming back -const F32 MAX_FAST_FRAME_TIME = 0.5f; -const F32 FAST_FRAME_INCREMENT = 0.1f; -const F32 MIN_DISPLAY_SCALE = 0.75f; +static const F32 MIN_DISPLAY_SCALE = 0.75f; std::string LLViewerWindow::sSnapshotBaseName; std::string LLViewerWindow::sSnapshotDir; |