summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerwindow.h
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2010-11-10 14:27:55 -0800
committerMerov Linden <merov@lindenlab.com>2010-11-10 14:27:55 -0800
commit61fbc02deb08c1a69b8c24498fe559359496ac91 (patch)
tree4c50352704fde294cbbe05c34ff138552ef4147f /indra/newview/llviewerwindow.h
parentb5df1d2abcef04ee5f491a7414189f4e82faaa1e (diff)
parentd7bca2b7b151969e45492e2ae244f50960fc4ddf (diff)
STORM-105 : merge with 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,