summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerwindow.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2010-11-11 09:29:30 -0500
committerOz Linden <oz@lindenlab.com>2010-11-11 09:29:30 -0500
commit20921d6a1a2e98fee750cb5a76adddb7266183f3 (patch)
tree8966865c6484af39f1d2af276f961f0999e49a3f /indra/newview/llviewerwindow.h
parentb5df1d2abcef04ee5f491a7414189f4e82faaa1e (diff)
parentfc22e2cf5bfc97caaf1ad69814b7dd217cbafef0 (diff)
merge performance data tracking system STORM-104
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,