summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatersnapshot.cpp
diff options
context:
space:
mode:
authorcallum <none@none>2010-11-15 17:21:27 -0800
committercallum <none@none>2010-11-15 17:21:27 -0800
commitb4efcccce7438a72078c02dd404080d6dee37622 (patch)
tree6d4890e3ace464bba7c81d3235ab799538080b02 /indra/newview/llfloatersnapshot.cpp
parenta52e06d209925d1942230e8c129d8b19af7b88b5 (diff)
parente8e1d7e629b9a4a65cde766ed81334140a749428 (diff)
Merge with tip of of viewer-development (http://hg.secondlife.com/viewer-development)
Diffstat (limited to 'indra/newview/llfloatersnapshot.cpp')
-rw-r--r--indra/newview/llfloatersnapshot.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp
index 36e8ad9dfc..51ee38bd65 100644
--- a/indra/newview/llfloatersnapshot.cpp
+++ b/indra/newview/llfloatersnapshot.cpp
@@ -1212,8 +1212,6 @@ LLViewerWindow::ESnapshotType LLFloaterSnapshot::Impl::getLayerType(LLFloaterSna
type = LLViewerWindow::SNAPSHOT_TYPE_COLOR;
else if (id == "depth")
type = LLViewerWindow::SNAPSHOT_TYPE_DEPTH;
- else if (id == "objects")
- type = LLViewerWindow::SNAPSHOT_TYPE_OBJECT_ID;
return type;
}