diff options
| author | Joshua Bell <josh@lindenlab.com> | 2011-05-16 10:09:53 -0700 |
|---|---|---|
| committer | Joshua Bell <josh@lindenlab.com> | 2011-05-16 10:09:53 -0700 |
| commit | cfad224f1c56556e58cfe7f3fe0606b4ab164ef8 (patch) | |
| tree | 1000311071eb6b9d8a1132f860ffd980bb5f5c5b /indra/newview/llviewerwindow.cpp | |
| parent | f440cd4af6cb7cd791e5f0eddb8dc9b99a37e0b0 (diff) | |
| parent | 0b5f662c3bf1655b95dbb92ad3f16bae37ee04f4 (diff) | |
Merge
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; |