From ad8478c47038c09f016da26669570a571753f397 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Sat, 23 Jun 2012 19:28:28 -0400
Subject: STORM-1892 Add Apply button to the edit content permission floater

---
 indra/newview/llfloaterbulkpermission.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/llfloaterbulkpermission.h')

diff --git a/indra/newview/llfloaterbulkpermission.h b/indra/newview/llfloaterbulkpermission.h
index 7dd05df7ee..58e4467f4d 100644
--- a/indra/newview/llfloaterbulkpermission.h
+++ b/indra/newview/llfloaterbulkpermission.h
@@ -72,6 +72,7 @@ private:
 								bool is_new);
 
 	void onCloseBtn();
+	void onOkBtn();
 	void onApplyBtn();
 	void onCommitCopy();
 	void onCheckAll() { doCheckUncheckAll(TRUE); }
-- 
cgit v1.2.3


From c3c8ae2782df14cf923c4c4954566ab6f1446340 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Tue, 15 Jan 2013 16:56:21 -0500
Subject: STORM-1892 Revert checkboxes to initial values when Cancel is clicked

---
 indra/newview/llfloaterbulkpermission.h | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'indra/newview/llfloaterbulkpermission.h')

diff --git a/indra/newview/llfloaterbulkpermission.h b/indra/newview/llfloaterbulkpermission.h
index 58e4467f4d..25e76eca65 100644
--- a/indra/newview/llfloaterbulkpermission.h
+++ b/indra/newview/llfloaterbulkpermission.h
@@ -95,6 +95,21 @@ private:
 	LLUUID mCurrentObjectID;
 	BOOL mDone;
 
+	bool mBulkChangeIncludeAnimations;
+	bool mBulkChangeIncludeBodyParts;
+	bool mBulkChangeIncludeClothing;
+	bool mBulkChangeIncludeGestures;
+	bool mBulkChangeIncludeNotecards;
+	bool mBulkChangeIncludeObjects;
+	bool mBulkChangeIncludeScripts;
+	bool mBulkChangeIncludeSounds;
+	bool mBulkChangeIncludeTextures;
+	bool mBulkChangeShareWithGroup;
+	bool mBulkChangeEveryoneCopy;
+	bool mBulkChangeNextOwnerModify;
+	bool mBulkChangeNextOwnerCopy;
+	bool mBulkChangeNextOwnerTransfer;
+
 	LLUUID mID;
 
 	const char* mStartString;
-- 
cgit v1.2.3