aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloatersnapshot.cpp
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-01-30 06:20:22 -0700
committerMcCabe Maxsted2009-01-30 06:20:22 -0700
commit6703f1f18fb00a530d6980d3af10bad9ecd377be (patch)
treef20882fccd135822e1e521cf18b7caf2ee4368e8 /linden/indra/newview/llfloatersnapshot.cpp
parentMade sure changelog lists the right Armin (diff)
downloadmeta-impy-6703f1f18fb00a530d6980d3af10bad9ecd377be.zip
meta-impy-6703f1f18fb00a530d6980d3af10bad9ecd377be.tar.gz
meta-impy-6703f1f18fb00a530d6980d3af10bad9ecd377be.tar.bz2
meta-impy-6703f1f18fb00a530d6980d3af10bad9ecd377be.tar.xz
Added TGA to snapshot options
Diffstat (limited to 'linden/indra/newview/llfloatersnapshot.cpp')
-rw-r--r--linden/indra/newview/llfloatersnapshot.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/linden/indra/newview/llfloatersnapshot.cpp b/linden/indra/newview/llfloatersnapshot.cpp
index f5f6c8e..accbcb4 100644
--- a/linden/indra/newview/llfloatersnapshot.cpp
+++ b/linden/indra/newview/llfloatersnapshot.cpp
@@ -71,6 +71,7 @@
71#include "llimagepng.h" 71#include "llimagepng.h"
72#include "llimagebmp.h" 72#include "llimagebmp.h"
73#include "llimagej2c.h" 73#include "llimagej2c.h"
74#include "llimagetga.h"
74#include "llvfile.h" 75#include "llvfile.h"
75#include "llvfs.h" 76#include "llvfs.h"
76 77
@@ -825,6 +826,9 @@ void LLSnapshotLivePreview::onIdle( void* snapshot_preview )
825 case LLFloaterSnapshot::SNAPSHOT_FORMAT_JPEG: 826 case LLFloaterSnapshot::SNAPSHOT_FORMAT_JPEG:
826 previewp->mFormattedImage = new LLImageJPEG(previewp->mSnapshotQuality); 827 previewp->mFormattedImage = new LLImageJPEG(previewp->mSnapshotQuality);
827 break; 828 break;
829 case LLFloaterSnapshot::SNAPSHOT_FORMAT_TGA:
830 previewp->mFormattedImage = new LLImageTGA();
831 break;
828 case LLFloaterSnapshot::SNAPSHOT_FORMAT_BMP: 832 case LLFloaterSnapshot::SNAPSHOT_FORMAT_BMP:
829 previewp->mFormattedImage = new LLImageBMP(); 833 previewp->mFormattedImage = new LLImageBMP();
830 break; 834 break;
@@ -1080,6 +1084,8 @@ LLFloaterSnapshot::ESnapshotFormat LLFloaterSnapshot::Impl::getFormatIndex(LLFlo
1080 index = SNAPSHOT_FORMAT_PNG; 1084 index = SNAPSHOT_FORMAT_PNG;
1081 else if (id == "JPEG") 1085 else if (id == "JPEG")
1082 index = SNAPSHOT_FORMAT_JPEG; 1086 index = SNAPSHOT_FORMAT_JPEG;
1087 else if (id == "TGA")
1088 index = SNAPSHOT_FORMAT_TGA;
1083 else if (id == "BMP") 1089 else if (id == "BMP")
1084 index = SNAPSHOT_FORMAT_BMP; 1090 index = SNAPSHOT_FORMAT_BMP;
1085 return index; 1091 return index;