diff options
| author | Jiao Li <angela@lindenlab.com> | 2009-09-15 09:34:17 +0000 |
|---|---|---|
| committer | Jiao Li <angela@lindenlab.com> | 2009-09-15 09:34:17 +0000 |
| commit | a4486b258cbd5e560cf7bec05e515e1ed56179fb (patch) | |
| tree | a1a94425d4e275d69f4713c755fa5c0131825b59 | |
| parent | f9326784941c9641ae7b455f76f5bc5953a8cae8 (diff) | |
EXT-610 Cannot change file type in snapshots floater -- to be reviewed
| -rw-r--r-- | indra/newview/llfloatersnapshot.cpp | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp index 13a2594c45..235e819218 100644 --- a/indra/newview/llfloatersnapshot.cpp +++ b/indra/newview/llfloatersnapshot.cpp @@ -1106,15 +1106,18 @@ LLSnapshotLivePreview::ESnapshotType LLFloaterSnapshot::Impl::getTypeIndex(LLFlo LLFloaterSnapshot::ESnapshotFormat LLFloaterSnapshot::Impl::getFormatIndex(LLFloaterSnapshot* floater) { ESnapshotFormat index = SNAPSHOT_FORMAT_PNG; - LLSD value = floater->childGetValue("local_format_combo"); - const std::string id = value.asString(); - if (id == "PNG") - index = SNAPSHOT_FORMAT_PNG; - else if (id == "JPEG") - index = SNAPSHOT_FORMAT_JPEG; - else if (id == "BMP") - index = SNAPSHOT_FORMAT_BMP; - return index; + if(floater->hasChild("local_format_combo")) + { + LLComboBox* local_format_combo = floater->findChild<LLComboBox>("local_format_combo"); + const std::string id = local_format_combo->getSelectedItemLabel(); + if (id == "PNG") + index = SNAPSHOT_FORMAT_PNG; + else if (id == "JPEG") + index = SNAPSHOT_FORMAT_JPEG; + else if (id == "BMP") + index = SNAPSHOT_FORMAT_BMP; + } + return index; } |