From 6703f1f18fb00a530d6980d3af10bad9ecd377be Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Fri, 30 Jan 2009 06:20:22 -0700
Subject: Added TGA to snapshot options

---
 ChangeLog.txt                                                     | 7 +++++++
 linden/indra/newview/llfloatersnapshot.cpp                        | 6 ++++++
 linden/indra/newview/llfloatersnapshot.h                          | 1 +
 linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml | 3 +++
 4 files changed, 17 insertions(+)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 1ef7109..b16bb04 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -10,6 +10,13 @@
 	* ChangeLog.txt
 	Armin Weatherwax, not Armin. 
 
+	* linden/indra/newview/llfloatersnapshot.cpp:
+	Added TGA to snapshot options.
+	* linden/indra/newview/llfloatersnapshot.h:
+	Ditto.
+	* linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml:
+	Ditto.
+
 
 2009-01-27  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
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 @@
 #include "llimagepng.h"
 #include "llimagebmp.h"
 #include "llimagej2c.h"
+#include "llimagetga.h"
 #include "llvfile.h"
 #include "llvfs.h"
 
@@ -825,6 +826,9 @@ void LLSnapshotLivePreview::onIdle( void* snapshot_preview )
 			case LLFloaterSnapshot::SNAPSHOT_FORMAT_JPEG:
 				previewp->mFormattedImage = new LLImageJPEG(previewp->mSnapshotQuality); 
 				break;
+			case LLFloaterSnapshot::SNAPSHOT_FORMAT_TGA:
+				previewp->mFormattedImage = new LLImageTGA(); 
+				break;
 			case LLFloaterSnapshot::SNAPSHOT_FORMAT_BMP:
 				previewp->mFormattedImage = new LLImageBMP(); 
 				break;
@@ -1080,6 +1084,8 @@ LLFloaterSnapshot::ESnapshotFormat LLFloaterSnapshot::Impl::getFormatIndex(LLFlo
 		index = SNAPSHOT_FORMAT_PNG;
 	else if (id == "JPEG")
 		index = SNAPSHOT_FORMAT_JPEG;
+	else if (id == "TGA")
+		index = SNAPSHOT_FORMAT_TGA;
 	else if (id == "BMP")
 		index = SNAPSHOT_FORMAT_BMP;
 	return index;
diff --git a/linden/indra/newview/llfloatersnapshot.h b/linden/indra/newview/llfloatersnapshot.h
index c97923b..f894c27 100644
--- a/linden/indra/newview/llfloatersnapshot.h
+++ b/linden/indra/newview/llfloatersnapshot.h
@@ -46,6 +46,7 @@ public:
 	{
 		SNAPSHOT_FORMAT_PNG,
 		SNAPSHOT_FORMAT_JPEG,
+		SNAPSHOT_FORMAT_TGA,
 		SNAPSHOT_FORMAT_BMP
 	} ESnapshotFormat;
 
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml b/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml
index c2eb3c2..a9ac7fa 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml
@@ -123,6 +123,9 @@
 		<combo_item name="JPEG">
 			JPEG
 		</combo_item>
+    <combo_item name="TGA">
+      TGA
+    </combo_item>
 		<combo_item name="BMP">
 			BMP
 		</combo_item>
-- 
cgit v1.1