svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910

svn merge -r 129913:131718 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05

Some branch shenannigans in the pluginapi_05 branch caused this to become a two-part merge.

1 files changed, 62 insertions, 0 deletions

diff --git a/indra/newview/llpanellandaudio.h b/indra/newview/llpanellandaudio.h
new file mode 100644
index 0000000000..de5da95fa4
--- /dev/null
+++ b/indra/newview/llpanellandaudio.h
@@ -0,0 +1,62 @@
+/**
+ * @file llpanellandaudio.h
+ * @brief Allows configuration of "audio" for a land parcel.
+ *   
+ *
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ *
+ * Copyright (c) 2007-2008, 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 LLPANELLANDAUDIO_H
+#define LLPANELLANDAUDIO_H
+
+#include "lllineeditor.h"
+#include "llpanel.h"
+#include "llparcelselection.h"
+#include "lluifwd.h"	// widget pointer types
+
+class LLPanelLandAudio
+	:	public LLPanel
+{
+public:
+	LLPanelLandAudio(LLSafeHandle<LLParcelSelection>& parcelp);
+	/*virtual*/ ~LLPanelLandAudio();
+	/*virtual*/ BOOL postBuild();
+	void refresh();
+
+private:
+	static void onCommitAny(LLUICtrl* ctrl, void *userdata);
+
+private:
+	LLCheckBoxCtrl* mCheckSoundLocal;
+	LLRadioGroup*	mRadioVoiceChat;
+	LLLineEditor*	mMusicURLEdit;
+	LLCheckBoxCtrl* mMusicUrlCheck;
+
+	LLSafeHandle<LLParcelSelection>&	mParcel;
+};
+
+#endif