diff options
author | Dave SIMmONs <simon@lindenlab.com> | 2010-11-12 12:24:15 -0800 |
---|---|---|
committer | Dave SIMmONs <simon@lindenlab.com> | 2010-11-12 12:24:15 -0800 |
commit | 187b21e6d22204e8989b1c7d5e75f8b7880dd79f (patch) | |
tree | 8f60e069433afa48fc9a20ecc165863a0108c1aa /indra/newview/llviewerwindow.h | |
parent | e3677f9ee2223cc13d12456e1eee4f7f9a90c474 (diff) | |
parent | 5b86f60a13f28f5978ff3a53371cb3bae7f0d837 (diff) |
Merge latest from lindenlab/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, |