aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewerwindow.h
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:11 -0500
committerJacek Antonelli2008-08-15 23:45:11 -0500
commit215f423cbe18fe9ca14a26caef918d303bad28ff (patch)
tree0743442b286216cc8e19aa487c26f4e9345ffd64 /linden/indra/newview/llviewerwindow.h
parentSecond Life viewer sources 1.18.3.5-RC (diff)
downloadmeta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.zip
meta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.tar.gz
meta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.tar.bz2
meta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.tar.xz
Second Life viewer sources 1.18.4.0-RC
Diffstat (limited to 'linden/indra/newview/llviewerwindow.h')
-rw-r--r--linden/indra/newview/llviewerwindow.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/linden/indra/newview/llviewerwindow.h b/linden/indra/newview/llviewerwindow.h
index 4560427..fcd1597 100644
--- a/linden/indra/newview/llviewerwindow.h
+++ b/linden/indra/newview/llviewerwindow.h
@@ -2,6 +2,8 @@
2 * @file llviewerwindow.h 2 * @file llviewerwindow.h
3 * @brief Description of the LLViewerWindow class. 3 * @brief Description of the LLViewerWindow class.
4 * 4 *
5 * $LicenseInfo:firstyear=2001&license=viewergpl$
6 *
5 * Copyright (c) 2001-2007, Linden Research, Inc. 7 * Copyright (c) 2001-2007, Linden Research, Inc.
6 * 8 *
7 * Second Life Viewer Source Code 9 * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
24 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO 26 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
25 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, 27 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
26 * COMPLETENESS OR PERFORMANCE. 28 * COMPLETENESS OR PERFORMANCE.
29 * $/LicenseInfo$
27 */ 30 */
28 31
29// 32//
@@ -217,7 +220,7 @@ public:
217 BOOL saveSnapshot(const LLString& filename, S32 image_width, S32 image_height, BOOL show_ui = TRUE, BOOL do_rebuild = FALSE, ESnapshotType type = SNAPSHOT_TYPE_COLOR); 220 BOOL saveSnapshot(const LLString& filename, S32 image_width, S32 image_height, BOOL show_ui = TRUE, BOOL do_rebuild = FALSE, ESnapshotType type = SNAPSHOT_TYPE_COLOR);
218 BOOL rawSnapshot(LLImageRaw *raw, S32 image_width, S32 image_height, BOOL keep_window_aspect = TRUE, 221 BOOL rawSnapshot(LLImageRaw *raw, S32 image_width, S32 image_height, BOOL keep_window_aspect = TRUE,
219 BOOL show_ui = TRUE, BOOL do_rebuild = FALSE, ESnapshotType type = SNAPSHOT_TYPE_COLOR ); 222 BOOL show_ui = TRUE, BOOL do_rebuild = FALSE, ESnapshotType type = SNAPSHOT_TYPE_COLOR );
220 BOOL saveImageNumbered(LLImageRaw *raw, const LLString& extension = ""); 223 BOOL saveImageNumbered(LLImageRaw *raw, const LLString& extension = LLString());
221 224
222 void playSnapshotAnimAndSound(); 225 void playSnapshotAnimAndSound();
223 226
@@ -385,7 +388,6 @@ void reset_viewer_state_on_sim(void);
385 388
386extern LLVelocityBar* gVelocityBar; 389extern LLVelocityBar* gVelocityBar;
387extern LLViewerWindow* gViewerWindow; 390extern LLViewerWindow* gViewerWindow;
388extern BOOL gQuietSnapshot;
389 391
390extern LLFrameTimer gMouseIdleTimer; // how long has it been since the mouse last moved? 392extern LLFrameTimer gMouseIdleTimer; // how long has it been since the mouse last moved?
391extern LLFrameTimer gAwayTimer; // tracks time before setting the avatar away state to true 393extern LLFrameTimer gAwayTimer; // tracks time before setting the avatar away state to true