summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatersnapshot.cpp
diff options
context:
space:
mode:
authorDave SIMmONs <simon@lindenlab.com>2010-11-12 12:24:15 -0800
committerDave SIMmONs <simon@lindenlab.com>2010-11-12 12:24:15 -0800
commit187b21e6d22204e8989b1c7d5e75f8b7880dd79f (patch)
tree8f60e069433afa48fc9a20ecc165863a0108c1aa /indra/newview/llfloatersnapshot.cpp
parente3677f9ee2223cc13d12456e1eee4f7f9a90c474 (diff)
parent5b86f60a13f28f5978ff3a53371cb3bae7f0d837 (diff)
Merge latest from 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;
}