diff --git a/indra/aistatemachine/aistatemachinethread.cpp b/indra/aistatemachine/aistatemachinethread.cpp
index f45d1e845..caeddea5c 100644
--- a/indra/aistatemachine/aistatemachinethread.cpp
+++ b/indra/aistatemachine/aistatemachinethread.cpp
@@ -101,7 +101,10 @@ void AIStateMachineThreadBase::multiplex_impl(state_type run_state)
 	  break;
 	case wait_stopped:
 	  if (!mThread->isStopped())
+	  {
+		yield();
 		break;
+	  }
 	  // We're done!
 	  //
 	  // We can only get here when AIThreadImpl::done called cont(), (very
diff --git a/indra/libpathing/llpathinglib.cpp b/indra/libpathing/llpathinglib.cpp
index 041311de9..19c0bff0f 100644
--- a/indra/libpathing/llpathinglib.cpp
+++ b/indra/libpathing/llpathinglib.cpp
@@ -1,3 +1,4 @@
+#include "sys.h"
 #include "llpathinglib.h"
 
 void LLPathingLib::initSystem()
diff --git a/indra/llinventory/llpermissionsflags.h b/indra/llinventory/llpermissionsflags.h
index 02224d0c8..925976242 100644
--- a/indra/llinventory/llpermissionsflags.h
+++ b/indra/llinventory/llpermissionsflags.h
@@ -89,6 +89,10 @@ const U8 PERM_GROUP		= 0x04;
 const U8 PERM_EVERYONE	= 0x08;
 const U8 PERM_NEXT_OWNER = 0x10;
 
+// Boolean values for "Set".
+const U8 PERM_SET_TRUE	= 0x1;
+const U8 PERM_SET_FALSE = 0x0;
+
 // This is just a quickie debugging key
 // no modify: PERM_ALL & ~PERM_MODIFY                  = 0x7fffbfff 
 // no copy:   PERM_ALL & ~PERM_COPY                    = 0x7fff7fff
diff --git a/indra/newview/importtracker.cpp b/indra/newview/importtracker.cpp
index 68a75796a..e88081969 100644
--- a/indra/newview/importtracker.cpp
+++ b/indra/newview/importtracker.cpp
@@ -236,7 +236,7 @@ void ImportTracker::get_update(S32 newid, BOOL justCreated, BOOL createSelected)
 				msg->nextBlockFast(_PREHASH_ObjectData);
 				msg->addU32Fast(_PREHASH_ObjectLocalID, (U32)newid);
 				msg->addU8Fast(_PREHASH_Field,	PERM_NEXT_OWNER);
-				msg->addBOOLFast(_PREHASH_Set,		PERM_ITEM_UNRESTRICTED);
+				msg->addU8Fast(_PREHASH_Set, PERM_SET_TRUE);
 				U32 flags = 0;
 				if ( gSavedSettings.getBOOL("NextOwnerCopy") )
 				{
@@ -718,7 +718,7 @@ void ImportTracker::send_properties(LLSD& prim, int counter)
 			msg->nextBlockFast(_PREHASH_ObjectData);
 			msg->addU32Fast(_PREHASH_ObjectLocalID, prim["LocalID"].asInteger());
 			msg->addU8Fast(_PREHASH_Field,	PERM_NEXT_OWNER);
-			msg->addBOOLFast(_PREHASH_Set,		PERM_ITEM_UNRESTRICTED);
+			msg->addU8Fast(_PREHASH_Set,	PERM_SET_TRUE);
 			msg->addU32Fast(_PREHASH_Mask,		U32(atoi(prim["next_owner_mask"].asString().c_str())));
 			*//*msg->sendReliable(gAgent.getRegion()->getHost());
 
@@ -732,7 +732,7 @@ void ImportTracker::send_properties(LLSD& prim, int counter)
 			msg->nextBlockFast(_PREHASH_ObjectData);
 			msg->addU32Fast(_PREHASH_ObjectLocalID, prim["LocalID"].asInteger());
 			msg->addU8Fast(_PREHASH_Field,	PERM_GROUP);
-			msg->addBOOLFast(_PREHASH_Set,		PERM_ITEM_UNRESTRICTED);
+			msg->addU8Fast(_PREHASH_Set,	PERM_SET_TRUE);
 			msg->addU32Fast(_PREHASH_Mask,		U32(atoi(prim["group_mask"].asString().c_str())));
 			*//*msg->sendReliable(gAgent.getRegion()->getHost());
 
@@ -746,7 +746,7 @@ void ImportTracker::send_properties(LLSD& prim, int counter)
 			msg->nextBlockFast(_PREHASH_ObjectData);
 			msg->addU32Fast(_PREHASH_ObjectLocalID, prim["LocalID"].asInteger());
 			msg->addU8Fast(_PREHASH_Field,	PERM_EVERYONE);
-			msg->addBOOLFast(_PREHASH_Set,		PERM_ITEM_UNRESTRICTED);
+			msg->addU8Fast(_PREHASH_Set,	PERM_SET_TRUE);
 			msg->addU32Fast(_PREHASH_Mask,		U32(atoi(prim["everyone_mask"].asString().c_str())));
 			msg->sendReliable(gAgent.getRegion()->getHost());
 
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index bee8211c4..300330cb6 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -4740,7 +4740,7 @@ void LLSelectMgr::packPermissions(LLSelectNode* node, void *user_data)
 	gMessageSystem->addU32Fast(_PREHASH_ObjectLocalID, node->getObject()->getLocalID());
 
 	gMessageSystem->addU8Fast(_PREHASH_Field,	data->mField);
-	gMessageSystem->addBOOLFast(_PREHASH_Set,		data->mSet);
+	gMessageSystem->addU8Fast(_PREHASH_Set,		data->mSet ? PERM_SET_TRUE : PERM_SET_FALSE);
 	gMessageSystem->addU32Fast(_PREHASH_Mask,		data->mMask);
 }
 
diff --git a/indra/newview/skins/default/xui/en-us/strings.xml b/indra/newview/skins/default/xui/en-us/strings.xml
index 5dbadb4d9..a78f7694b 100644
--- a/indra/newview/skins/default/xui/en-us/strings.xml
+++ b/indra/newview/skins/default/xui/en-us/strings.xml
@@ -3005,7 +3005,7 @@ Where tag = tag string to match.  Removes bot's matching the tag.
 	<!-- inventory -->
 	<string name="InventoryNoMatchingItems">No matching items found in inventory.</string>
 	<string name="MarketplaceURL">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/</string>
-	<string name="MarketplaceURL_CreateStore">http://community.secondlife.com/t5/English-Knowledge-Base/Selling-in-the-Marketplace/ta-p/700193#Section_.4</string>
+	<string name="MarketplaceURL_CreateStore">http://community.secondlife.com/t5/English-Knowledge-Base/Selling-in-the-Marketplace/ta-p/700193#Section_.3</string>
 	<string name="MarketplaceURL_Dashboard">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/store/dashboard</string>
 	<string name="MarketplaceURL_Imports">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/store/imports</string>
 	<string name="MarketplaceURL_LearnMore">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/learn_more</string>
diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
index 5a97e0a16..7e3ced355 100644
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -2953,7 +2953,7 @@ Where tag = tag string to match.  Removes bot's matching the tag.
 	<!-- inventory -->
 	<string name="InventoryNoMatchingItems">Elementos no hallados en el inventario.</string>
 	<string name="MarketplaceURL">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/</string>
-	<string name="MarketplaceURL_CreateStore">http://community.secondlife.com/t5/English-Knowledge-Base/Selling-in-the-Marketplace/ta-p/700193#Section_.4</string>
+	<string name="MarketplaceURL_CreateStore">http://community.secondlife.com/t5/English-Knowledge-Base/Selling-in-the-Marketplace/ta-p/700193#Section_.3</string>
 	<string name="MarketplaceURL_Dashboard">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/store/dashboard</string>
 	<string name="MarketplaceURL_Imports">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/store/imports</string>
 	<string name="MarketplaceURL_LearnMore">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/learn_more</string>
diff --git a/indra/newview/statemachine/aifilepicker.cpp b/indra/newview/statemachine/aifilepicker.cpp
index 418d83955..3cc3ccbcd 100644
--- a/indra/newview/statemachine/aifilepicker.cpp
+++ b/indra/newview/statemachine/aifilepicker.cpp
@@ -420,6 +420,7 @@ void AIFilePicker::multiplex_impl(state_type run_state)
 			// Store folder of first filename as context.
 			AIFilePicker::store_folder(mContext, getFolder());
 			finish();
+			break;
 		}
 	}
 }