summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerwindow.h
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2010-11-10 22:39:11 -0800
committerMerov Linden <merov@lindenlab.com>2010-11-10 22:39:11 -0800
commit0e07758b540374aa421d2938ce5ed13e2b9eefe4 (patch)
tree145600f9494489b686e13b53edc7f10d75afa0e3 /indra/newview/llviewerwindow.h
parent4bbe823302427a705ea541d968f6058571a13c2f (diff)
parent61fbc02deb08c1a69b8c24498fe559359496ac91 (diff)
merge with STORM-105 and viewer-development
Diffstat (limited to 'indra/newview/llviewerwindow.h')
-rw-r--r--indra/newview/llviewerwindow.h3
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,