From fd4da22ed6b85c75ef40c6e4d6e8f56f55e22fb1 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Tue, 13 Oct 2015 09:28:11 +0200
Subject: [PATCH] BUG-10466: Default creation permissions changes for objects
 don't work until you relog; Also set cap sent = true only on success so we
 automatically retry on region change

---
 indra/newview/llfloaterperms.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llfloaterperms.cpp b/indra/newview/llfloaterperms.cpp
index f3f6935292..bf1a2c1436 100755
--- a/indra/newview/llfloaterperms.cpp
+++ b/indra/newview/llfloaterperms.cpp
@@ -243,6 +243,12 @@ void LLFloaterPermsResponder::httpSuccess()
 	// even if it is the same as a previous one.
 	sPreviousReason = "";
 	LL_INFOS("ObjectPermissionsFloater") << "Default permissions successfully sent to simulator" << LL_ENDL;
+
+	// <FS:Ansariel> Set cap sent = true only on success to allow re-transmit on region change
+	LLFloaterPermsDefault::setCapSent(true);
+
+	// <FS:Ansariel> BUG-10466: Default creation permissions changes for objects don't work until you relog
+	LLFloaterPermsRequester::finalize();
 }
 
 std::string	LLFloaterPermsResponder::sPreviousReason;
@@ -255,7 +261,8 @@ void LLFloaterPermsDefault::sendInitialPerms()
 	// </FS:Ansariel>
 	{
 		updateCap();
-		setCapSent(true);
+		// <FS:Ansariel> Set cap sent = true only on success to allow re-transmit on region change
+		//setCapSent(true);
 	}
 }