svn merge -r105329:105903 svn+ssh://svn/svn/linden/branches/featurettes/featurettes-batch4-merge

Resolving QAR-1051 Merge featurettes batch #4

1 files changed, 70 insertions, 0 deletions

diff --git a/indra/newview/llfloaterperms.h b/indra/newview/llfloaterperms.h
new file mode 100644
index 0000000000..bd9dee1869
--- /dev/null
+++ b/indra/newview/llfloaterperms.h
@@ -0,0 +1,70 @@
+/** 
+ * @file llfloaterperms.h
+ * @brief Asset creation permission preferences.
+ * @author Coco 
+ *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
+ * Copyright (c) 2002-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_LLFLOATERPERMPREFS_H
+#define LL_LLFLOATERPERMPREFS_H
+
+#include "llfloater.h"
+
+class LLFloaterPerms : public LLFloater, public LLFloaterSingleton<LLFloaterPerms>
+{
+	friend class LLUISingleton<LLFloaterPerms, VisibilityPolicy<LLFloater> >;
+	
+public:
+	/*virtual*/ void onClose(bool app_quitting = false);
+	/*virtual*/ BOOL postBuild();
+	void ok();
+	void cancel();
+	static void onClickOK(void*);
+	static void onClickCancel(void*);
+	static void onCommitCopy(LLUICtrl* ctrl, void* data);
+	// Convenience methods to get current permission preference bitfields from saved settings:
+	static U32 getEveryonePerms(std::string prefix=""); // prefix + "EveryoneCopy"
+	static U32 getGroupPerms(std::string prefix=""); // prefix + "ShareWithGroup"
+	static U32 getNextOwnerPerms(std::string prefix=""); // bitfield for prefix + "NextOwner" + "Copy", "Modify", and "Transfer"
+
+private:
+	LLFloaterPerms(const LLSD& seed);
+	void refresh();
+
+	/// callback for the menus help button
+	static void onClickHelp(void* data);
+
+	BOOL // cached values only for implementing cancel.
+		mShareWithGroup,
+		mEveryoneCopy,
+		mNextOwnerCopy,
+		mNextOwnerModify,
+		mNextOwnerTransfer;
+};
+
+#endif