From 2d701456a07d37a520f436f9e83b1008e492f232 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Thu, 12 Dec 2013 08:51:15 -0500
Subject: STORM-68 Fix bug for new gestures, notecards, and scripts where a
 copied item did not preserve its default permissions. Add apply button.

---
 indra/newview/llfloaterperms.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'indra/newview/llfloaterperms.cpp')

diff --git a/indra/newview/llfloaterperms.cpp b/indra/newview/llfloaterperms.cpp
index b4ea34d5f1..0178c0b4f1 100755
--- a/indra/newview/llfloaterperms.cpp
+++ b/indra/newview/llfloaterperms.cpp
@@ -103,6 +103,7 @@ LLFloaterPermsDefault::LLFloaterPermsDefault(const LLSD& seed)
 	: LLFloater(seed)
 {
 	mCommitCallbackRegistrar.add("PermsDefault.Copy", boost::bind(&LLFloaterPermsDefault::onCommitCopy, this, _2));
+	mCommitCallbackRegistrar.add("PermsDefault.Apply", boost::bind(&LLFloaterPermsDefault::onClickApply, this));
 	mCommitCallbackRegistrar.add("PermsDefault.OK", boost::bind(&LLFloaterPermsDefault::onClickOK, this));
 	mCommitCallbackRegistrar.add("PermsDefault.Cancel", boost::bind(&LLFloaterPermsDefault::onClickCancel, this));
 }
@@ -129,9 +130,14 @@ BOOL LLFloaterPermsDefault::postBuild()
 	return true;
 }
 
+void LLFloaterPermsDefault::onClickApply()
+{
+	apply();
+}
+
 void LLFloaterPermsDefault::onClickOK()
 {
-	ok();
+	apply();
 	closeFloater();
 }
 
@@ -164,7 +170,6 @@ private:
 
 	void error(U32 status, const std::string& reason)
 	{
-llwarns << "DBG !" << sPreviousReason << "!" << llendl;
 		// Do not display the same error more than once in a row
 		if (reason != sPreviousReason)
 		{
@@ -217,7 +222,7 @@ void LLFloaterPermsDefault::setCapSent(bool cap_sent)
 	mCapSent = cap_sent;
 }
 
-void LLFloaterPermsDefault::ok()
+void LLFloaterPermsDefault::apply()
 {
 //	Changes were already applied automatically to saved settings.
 //	Refreshing internal values makes it official.
-- 
cgit v1.2.3