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

1 files changed, 10 insertions, 5 deletions

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;