EFFECTIVE MERGES:

svn merge -r 79616:82632 svn+ssh://svn/svn/linden/branches/maintenance/maintenance-7 into release
svn merge -r 83211:87215 svn+ssh://svn/svn/linden/branches/php-framework-3 into release

ACTUAL MERGE: svn merge -r 87631:87698  svn+ssh://svn/svn/linden/qa/combo-merge-maintenance-7-php-framework-3 into release

dataserver-is-deprecated

4 files changed, 50 insertions, 36 deletions

diff --git a/indra/llinventory/llparcel.cpp b/indra/llinventory/llparcel.cpp
index 15beeec866..0b11b6009e 100644
--- a/indra/llinventory/llparcel.cpp
+++ b/indra/llinventory/llparcel.cpp
@@ -1,33 +1,33 @@
 /** 
-* @file llparcel.cpp
-* @brief A land parcel.
-*
-* $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$
-*/
+ * @file llparcel.cpp
+ * @brief A land parcel.
+ *
+ * $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$
+ */
 
 #include "linden_common.h"
 
@@ -241,6 +241,9 @@ void LLParcel::init(const LLUUID &owner_id,
 	setSelectedPrimCount(0);
 	setTempPrimCount(0);
 	setCleanOtherTime(0);
+    setRegionPushOverride(FALSE);
+    setRegionDenyAnonymousOverride(FALSE);
+    setRegionDenyAgeUnverifiedOverride(FALSE);
 	setParcelPrimBonus(parcel_object_bonus);
 
 	setPreviousOwnerID(LLUUID::null);
diff --git a/indra/llinventory/llpermissions.cpp b/indra/llinventory/llpermissions.cpp
index 1788fedf50..b137eeff33 100644
--- a/indra/llinventory/llpermissions.cpp
+++ b/indra/llinventory/llpermissions.cpp
@@ -826,7 +826,7 @@ LLXMLNode *LLPermissions::exportFileXML() const
 {
 	LLXMLNode *ret = new LLXMLNode("permissions", FALSE);
 
-	ret->createChild("group_owned", TRUE)->setBoolValue(1, (const BOOL*)&mIsGroupOwned);
+	ret->createChild("group_owned", TRUE)->setBoolValue(mIsGroupOwned);
 
 	ret->createChild("base_mask", FALSE)->setByteValue(4, (U8*)&mMaskBase, LLXMLNode::ENCODING_HEX);
 	ret->createChild("owner_mask", FALSE)->setByteValue(4, (U8*)&mMaskOwner, LLXMLNode::ENCODING_HEX);
@@ -869,7 +869,11 @@ bool LLPermissions::importXML(LLXMLNode* node)
 		if (node->getChild("group_id", sub_node))
 			success = success && (1 == sub_node->getUUIDValue(1, &mGroup));
 		if (node->getChild("group_owned", sub_node))
-			success = success && (1 == sub_node->getBoolValue(1, (BOOL*)&mIsGroupOwned));
+		{
+			BOOL tmpbool = FALSE;
+			success = success && (1 == sub_node->getBoolValue(1, &tmpbool));
+			mIsGroupOwned = (bool)tmpbool;
+		}
 		if (!success)
 		{
 			lldebugs << "LLPermissions::importXML() failed for node named '" 
diff --git a/indra/llinventory/lltransactionflags.cpp b/indra/llinventory/lltransactionflags.cpp
index d4c97d11bf..9b49a6b589 100644
--- a/indra/llinventory/lltransactionflags.cpp
+++ b/indra/llinventory/lltransactionflags.cpp
@@ -95,12 +95,16 @@ std::string build_transfer_message_to_source(
 	const LLUUID& dest_id,
 	const std::string& dest_name,
 	S32 transaction_type,
-	const char* description)
+	const char* desc)
 {
+	std::string description(ll_safe_string(desc));
 	lldebugs << "build_transfer_message_to_source: " << amount << " "
 		<< source_id << " " << dest_id << " " << dest_name << " "
-		<< (description?description:"(no desc)") << llendl;
-	if((0 == amount) || source_id.isNull()) return ll_safe_string(description);
+		<< transaction_type << " "
+		<< (description.empty()?"(no desc)":description.c_str())
+		<< llendl;
+	if(source_id.isNull()) return description;
+	if((0 == amount) && description.empty()) return description;
 	std::ostringstream ostr;
 	if(dest_id.isNull())
 	{
@@ -123,7 +127,7 @@ std::string build_transfer_message_to_source(
 	else
 	{
 		ostr << "You paid " << dest_name << " L$" << amount;
-		append_reason(ostr, transaction_type, description);
+		append_reason(ostr, transaction_type, description.c_str());
 	}
 	ostr << ".";
 	return ostr.str();
@@ -139,7 +143,8 @@ std::string build_transfer_message_to_destination(
 {
 	lldebugs << "build_transfer_message_to_dest: " << amount << " "
 		<< dest_id << " " << source_id << " " << source_name << " "
-		<< (description?description:"(no desc)") << llendl;
+		<< transaction_type << " " << (description?description:"(no desc)")
+		<< llendl;
 	if(0 == amount) return std::string();
 	if(dest_id.isNull()) return ll_safe_string(description);
 	std::ostringstream ostr;
diff --git a/indra/llinventory/lltransactionflags.h b/indra/llinventory/lltransactionflags.h
index f5ee9d68ed..3bf08af282 100644
--- a/indra/llinventory/lltransactionflags.h
+++ b/indra/llinventory/lltransactionflags.h
@@ -31,6 +31,8 @@
 #ifndef LL_LLTRANSACTIONFLAGS_H
 #define LL_LLTRANSACTIONFLAGS_H
 
+class LLUUID;
+
 typedef U8 TransactionFlags;
 
 // defined in common/llinventory/lltransactionflags.cpp