Merge of windlight into release (QAR-286). This includes all changes in

windlight14 which have passed QA (up through r79932).

svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620

1 files changed, 90 insertions, 0 deletions

diff --git a/indra/newview/llfloaterpostprocess.h b/indra/newview/llfloaterpostprocess.h
new file mode 100644
index 0000000000..8b590f8b8e
--- /dev/null
+++ b/indra/newview/llfloaterpostprocess.h
@@ -0,0 +1,90 @@
+/** 
+ * @file llfloaterpostprocess.h
+ * @brief LLFloaterPostProcess class definition
+ *
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007-2007, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlife.com/developers/opensource/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlife.com/developers/opensource/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLFLOATERPOSTPROCESS_H
+#define LL_LLFLOATERPOSTPROCESS_H
+
+#include "llfloater.h"
+
+class LLButton;
+class LLSliderCtrl;
+class LLTabContainer;
+class LLPanelPermissions;
+class LLPanelObject;
+class LLPanelVolume;
+class LLPanelContents;
+class LLPanelFace;
+
+/**
+ * Menu for adjusting the post process settings of the world
+ */
+class LLFloaterPostProcess : public LLFloater
+{
+public:
+
+	LLFloaterPostProcess();
+	virtual ~LLFloaterPostProcess();
+
+	/// one and one instance only
+	static LLFloaterPostProcess* instance();
+
+	/// post process callbacks
+	static void onBoolToggle(LLUICtrl* ctrl, void* userData);
+	static void onFloatControlMoved(LLUICtrl* ctrl, void* userData);
+	static void onColorControlRMoved(LLUICtrl* ctrl, void* userData);
+	static void onColorControlGMoved(LLUICtrl* ctrl, void* userData);
+	static void onColorControlBMoved(LLUICtrl* ctrl, void* userData);
+	static void onColorControlIMoved(LLUICtrl* ctrl, void* userData);
+	static void onLoadEffect(void* userData);
+	static void onSaveEffect(void* userData);
+	static void onChangeEffectName(LLUICtrl* ctrl, void * userData);
+
+	/// prompts a user when overwriting an effect
+	static void saveAlertCallback(S32 option, void* userData);
+
+	/// show off our menu
+	static void show();
+
+	/// stuff to do on exit
+	virtual void onClose(bool app_quitting);
+
+	/// sync up sliders
+	void syncMenu();
+
+/*
+	void refresh();
+*/
+public:
+	
+	static LLFloaterPostProcess* sPostProcess;
+};
+
+#endif