summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatersnapshot.cpp
diff options
context:
space:
mode:
authorKyle Ambroff <ambroff@lindenlab.com>2010-11-15 14:14:00 -0800
committerKyle Ambroff <ambroff@lindenlab.com>2010-11-15 14:14:00 -0800
commited9af1151fea725574ddedafd75a9ecfb5927082 (patch)
tree6fb865d740e84865b439d224043a5de7151765c8 /indra/newview/llfloatersnapshot.cpp
parent0dbf75ab657446b51e6e9795ddccc16bb9f6fd02 (diff)
parenta9eb639511a09dc072e67e10d8885a0b4f7587da (diff)
Merge with lindenlab/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;
}