aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewerwindow.h
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:44:50 -0500
committerJacek Antonelli2008-08-15 23:44:50 -0500
commit89fe5dab825a62a0e3fd8d248cbc91c65eb2a426 (patch)
treebcff14b7888d04a2fec799c59369f6095224bd08 /linden/indra/newview/llviewerwindow.h
parentSecond Life viewer sources 1.13.3.2 (diff)
downloadmeta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.zip
meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.gz
meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.bz2
meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.xz
Second Life viewer sources 1.14.0.0
Diffstat (limited to 'linden/indra/newview/llviewerwindow.h')
-rw-r--r--linden/indra/newview/llviewerwindow.h16
1 files changed, 4 insertions, 12 deletions
diff --git a/linden/indra/newview/llviewerwindow.h b/linden/indra/newview/llviewerwindow.h
index 8c6d812..debe509 100644
--- a/linden/indra/newview/llviewerwindow.h
+++ b/linden/indra/newview/llviewerwindow.h
@@ -208,7 +208,7 @@ public:
208 BOOL saveSnapshot(const LLString& filename, S32 image_width, S32 image_height, BOOL show_ui = TRUE, BOOL do_rebuild = FALSE, ESnapshotType type = SNAPSHOT_TYPE_COLOR); 208 BOOL saveSnapshot(const LLString& filename, S32 image_width, S32 image_height, BOOL show_ui = TRUE, BOOL do_rebuild = FALSE, ESnapshotType type = SNAPSHOT_TYPE_COLOR);
209 BOOL rawSnapshot(LLImageRaw *raw, S32 image_width, S32 image_height, BOOL keep_window_aspect = TRUE, 209 BOOL rawSnapshot(LLImageRaw *raw, S32 image_width, S32 image_height, BOOL keep_window_aspect = TRUE,
210 BOOL show_ui = TRUE, BOOL do_rebuild = FALSE, ESnapshotType type = SNAPSHOT_TYPE_COLOR ); 210 BOOL show_ui = TRUE, BOOL do_rebuild = FALSE, ESnapshotType type = SNAPSHOT_TYPE_COLOR );
211 BOOL saveImageNumbered(LLImageRaw *raw); 211 BOOL saveImageNumbered(LLImageRaw *raw, const LLString& extension = "");
212 212
213 void playSnapshotAnimAndSound(); 213 void playSnapshotAnimAndSound();
214 214
@@ -224,12 +224,6 @@ public:
224 224
225 LLViewerObject* getObjectUnderCursor(const F32 depth = 16.0f); 225 LLViewerObject* getObjectUnderCursor(const F32 depth = 16.0f);
226 226
227 void requestFastFrame(LLView* view);
228 BOOL renderingFastFrame() { return mFastFrameTimer.getStarted() && !firstFastFrame(); }
229 void finishFastFrame() { mFastFrameTimer.stop(); mRenderFullFrame = FALSE; }
230 BOOL firstFastFrame() { return mRenderFullFrame; }
231 void finishFirstFastFrame() { mRenderFullFrame = FALSE; }
232
233 // Returns a pointer to the last object hit 227 // Returns a pointer to the last object hit
234 LLViewerObject *lastObjectHit(); 228 LLViewerObject *lastObjectHit();
235 LLViewerObject *lastNonFloraObjectHit(); 229 LLViewerObject *lastNonFloraObjectHit();
@@ -339,14 +333,12 @@ protected:
339 333
340 LLString mOverlayTitle; // Used for special titles such as "Second Life - Special E3 2003 Beta" 334 LLString mOverlayTitle; // Used for special titles such as "Second Life - Special E3 2003 Beta"
341 335
342 static char sSnapshotBaseName[LL_MAX_PATH]; 336 static char sSnapshotBaseName[LL_MAX_PATH]; /* Flawfinder: ignore */
343 static char sSnapshotDir[LL_MAX_PATH]; 337 static char sSnapshotDir[LL_MAX_PATH]; /* Flawfinder: ignore */
344 338
345 static char sMovieBaseName[LL_MAX_PATH]; 339 static char sMovieBaseName[LL_MAX_PATH]; /* Flawfinder: ignore */
346 340
347 BOOL mIgnoreActivate; 341 BOOL mIgnoreActivate;
348 LLFrameTimer mFastFrameTimer;
349 BOOL mRenderFullFrame;
350 U8* mPickBuffer; 342 U8* mPickBuffer;
351}; 343};
352 344