svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7

Merging branches/media-on-a-prim/moap-7 down to viewer-2.0.

1 files changed, 89 insertions, 0 deletions

diff --git a/indra/newview/llpanelmediasettingsgeneral.h b/indra/newview/llpanelmediasettingsgeneral.h
new file mode 100644
index 0000000000..24678a3a07
--- /dev/null
+++ b/indra/newview/llpanelmediasettingsgeneral.h
@@ -0,0 +1,89 @@
+/**
+ * @file llpanelmediasettingsgeneral.h
+ * @brief LLPanelMediaSettingsGeneral class definition
+ *
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2009, 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://secondlifegrid.net/programs/open_source/licensing/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://secondlifegrid.net/programs/open_source/licensing/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_LLPANELMEDIAMEDIASETTINGSGENERAL_H
+#define LL_LLPANELMEDIAMEDIASETTINGSGENERAL_H
+
+#include "llpanel.h"
+
+class LLButton;
+class LLCheckBoxCtrl;
+class LLComboBox;
+class LLLineEditor;
+class LLSpinCtrl;
+class LLTextureCtrl;
+class LLMediaCtrl;
+class LLFloaterMediaSettings;
+
+class LLPanelMediaSettingsGeneral : public LLPanel
+{
+public:
+	BOOL postBuild();
+	virtual void draw();
+	static void apply(void*);
+    void getValues(LLSD &fill_me_in);
+
+	LLPanelMediaSettingsGeneral();
+	~LLPanelMediaSettingsGeneral();
+
+	void setParent( LLFloaterMediaSettings* parent );
+	static void initValues( void* userdata, const LLSD& media_settings );
+	static void clearValues( void* userdata );
+	
+	void updateMediaPreview();
+	void updateCurrentURL();
+	
+	void onClose();
+
+protected:
+	LLFloaterMediaSettings* mParent;
+
+private:
+	void onBtnResetCurrentUrl();
+	static void onCommitHomeURL(LLUICtrl* ctrl, void *userdata );
+
+	LLComboBox* mControls;
+	LLCheckBoxCtrl* mAutoLoop;
+	LLCheckBoxCtrl* mFirstClick;
+	LLTextureCtrl* mMediaPreview;
+	LLCheckBoxCtrl* mAutoZoom;
+	LLCheckBoxCtrl* mAutoPlay;
+	LLCheckBoxCtrl* mAutoScale;
+	LLSpinCtrl* mWidthPixels;
+	LLSpinCtrl* mHeightPixels;
+	LLLineEditor* mHomeURL;
+	LLLineEditor* mCurrentURL;
+	LLCheckBoxCtrl* mAltImageEnable;
+	LLMediaCtrl* mPreviewMedia;
+};
+
+#endif  // LL_LLPANELMEDIAMEDIASETTINGSGENERAL_H