diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-12-01 10:55:24 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-12-01 10:55:24 -0500 |
| commit | bfd8efb05753ac9ed858476797b5d407c912d926 (patch) | |
| tree | 52905cf59bcd5b67ddc186b26a23959201353a7a /indra/newview/llviewerwindow.h | |
| parent | ed64630a67c2c216c369099532323cab2e251cab (diff) | |
| parent | b778ba9b882ecb03e61b3b9bd833618ca096f5da (diff) | |
Automated merge up from 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 f0b36bb7b1..58ac0dc2ac 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, |