From 798d367d54a6c6379ad355bd8345fa40e31e7fe9 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sat, 6 Sep 2008 18:24:57 -0500
Subject: Second Life viewer sources 1.21.0-RC

---
 linden/indra/newview/llfloatersnapshot.h | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

(limited to 'linden/indra/newview/llfloatersnapshot.h')

diff --git a/linden/indra/newview/llfloatersnapshot.h b/linden/indra/newview/llfloatersnapshot.h
index 3948a0f..c97923b 100644
--- a/linden/indra/newview/llfloatersnapshot.h
+++ b/linden/indra/newview/llfloatersnapshot.h
@@ -38,15 +38,23 @@
 #include "llimagegl.h"
 #include "llcharacter.h"
 
+
 class LLFloaterSnapshot : public LLFloater
 {
 public:
-    LLFloaterSnapshot();
+	typedef enum e_snapshot_format
+	{
+		SNAPSHOT_FORMAT_PNG,
+		SNAPSHOT_FORMAT_JPEG,
+		SNAPSHOT_FORMAT_BMP
+	} ESnapshotFormat;
+
+	LLFloaterSnapshot();
 	virtual ~LLFloaterSnapshot();
 
-	virtual BOOL postBuild();
-	virtual void draw();
-	virtual void onClose(bool app_quitting);
+	/*virtual*/ BOOL postBuild();
+	/*virtual*/ void draw();
+	/*virtual*/ void onClose(bool app_quitting);
 
 	static void show(void*);
 	static void hide(void*);
@@ -69,7 +77,7 @@ private:
 class LLSnapshotFloaterView : public LLFloaterView
 {
 public:
-	LLSnapshotFloaterView( const LLString& name, const LLRect& rect );
+	LLSnapshotFloaterView( const std::string& name, const LLRect& rect );
 	virtual ~LLSnapshotFloaterView();
 
 	/*virtual*/	BOOL handleKey(KEY key, MASK mask, BOOL called_from_parent);
@@ -79,4 +87,5 @@ public:
 };
 
 extern LLSnapshotFloaterView* gSnapshotFloaterView;
+
 #endif // LL_LLFLOATERSNAPSHOT_H
-- 
cgit v1.1