diff options
author | callum <none@none> | 2010-11-15 17:21:27 -0800 |
---|---|---|
committer | callum <none@none> | 2010-11-15 17:21:27 -0800 |
commit | b4efcccce7438a72078c02dd404080d6dee37622 (patch) | |
tree | 6d4890e3ace464bba7c81d3235ab799538080b02 /indra/newview/llviewerwindow.h | |
parent | a52e06d209925d1942230e8c129d8b19af7b88b5 (diff) | |
parent | e8e1d7e629b9a4a65cde766ed81334140a749428 (diff) |
Merge with tip of of viewer-development (http://hg.secondlife.com/viewer-development)
Diffstat (limited to 'indra/newview/llviewerwindow.h')
-rw-r--r-- | indra/newview/llviewerwindow.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llviewerwindow.h b/indra/newview/llviewerwindow.h index 633c3a41d2..47fb7c4883 100644 --- a/indra/newview/llviewerwindow.h +++ b/indra/newview/llviewerwindow.h @@ -316,8 +316,7 @@ public: typedef enum { SNAPSHOT_TYPE_COLOR, - SNAPSHOT_TYPE_DEPTH, - SNAPSHOT_TYPE_OBJECT_ID + SNAPSHOT_TYPE_DEPTH } ESnapshotType; BOOL saveSnapshot(const std::string& filename, S32 image_width, S32 image_height, BOOL show_ui = TRUE, BOOL do_rebuild = FALSE, ESnapshotType type = SNAPSHOT_TYPE_COLOR); BOOL rawSnapshot(LLImageRaw *raw, S32 image_width, S32 image_height, BOOL keep_window_aspect = TRUE, BOOL is_texture = FALSE, |