aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloatersnapshot.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llfloatersnapshot.cpp')
-rw-r--r--linden/indra/newview/llfloatersnapshot.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/newview/llfloatersnapshot.cpp b/linden/indra/newview/llfloatersnapshot.cpp
index e007680..55e108b 100644
--- a/linden/indra/newview/llfloatersnapshot.cpp
+++ b/linden/indra/newview/llfloatersnapshot.cpp
@@ -1114,10 +1114,10 @@ LLSnapshotLivePreview::ESnapshotType LLFloaterSnapshot::Impl::getTypeIndex(LLFlo
1114LLFloaterSnapshot::ESnapshotFormat LLFloaterSnapshot::Impl::getFormatIndex(LLFloaterSnapshot* floater) 1114LLFloaterSnapshot::ESnapshotFormat LLFloaterSnapshot::Impl::getFormatIndex(LLFloaterSnapshot* floater)
1115{ 1115{
1116 ESnapshotFormat index = SNAPSHOT_FORMAT_PNG; 1116 ESnapshotFormat index = SNAPSHOT_FORMAT_PNG;
1117 if(floater->hasChild("local_format_combo")) 1117 if (floater->hasChild("local_format_combo"))
1118 { 1118 {
1119 LLComboBox* local_format_combo = floater->getChild<LLComboBox>("local_format_combo"); 1119 LLComboBox* local_format_combo = floater->getChild<LLComboBox>("local_format_combo");
1120 const std::string id = local_format_combo->getSelectedItemLabel(); 1120 const std::string id = local_format_combo->getValue().asString();
1121 if (id == "PNG") 1121 if (id == "PNG")
1122 index = SNAPSHOT_FORMAT_PNG; 1122 index = SNAPSHOT_FORMAT_PNG;
1123 else if (id == "JPEG") 1123 else if (id == "JPEG")
@@ -1136,10 +1136,10 @@ LLFloaterSnapshot::ESnapshotFormat LLFloaterSnapshot::Impl::getFormatIndex(LLFlo
1136LLViewerWindow::ESnapshotType LLFloaterSnapshot::Impl::getLayerType(LLFloaterSnapshot* floater) 1136LLViewerWindow::ESnapshotType LLFloaterSnapshot::Impl::getLayerType(LLFloaterSnapshot* floater)
1137{ 1137{
1138 LLViewerWindow::ESnapshotType type = LLViewerWindow::SNAPSHOT_TYPE_COLOR; 1138 LLViewerWindow::ESnapshotType type = LLViewerWindow::SNAPSHOT_TYPE_COLOR;
1139 if(floater->hasChild("layer_types")) 1139 if (floater->hasChild("layer_types"))
1140 { 1140 {
1141 LLComboBox* layer_types = floater->getChild<LLComboBox>("layer_types"); 1141 LLComboBox* layer_types = floater->getChild<LLComboBox>("layer_types");
1142 const std::string id = layer_types->getSelectedItemLabel(); 1142 const std::string id = layer_types->getValue().asString();
1143 if (id == "colors") 1143 if (id == "colors")
1144 type = LLViewerWindow::SNAPSHOT_TYPE_COLOR; 1144 type = LLViewerWindow::SNAPSHOT_TYPE_COLOR;
1145 else if (id == "depth") 1145 else if (id == "depth")