From d273ba2ce2707c6a2fe45c08fdc2524aae19ad00 Mon Sep 17 00:00:00 2001 From: Brian McGroarty Date: Wed, 7 May 2008 20:48:38 +0000 Subject: Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated --- indra/llinventory/lltransactionflags.cpp | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'indra/llinventory/lltransactionflags.cpp') diff --git a/indra/llinventory/lltransactionflags.cpp b/indra/llinventory/lltransactionflags.cpp index 9b49a6b589..d4c97d11bf 100644 --- a/indra/llinventory/lltransactionflags.cpp +++ b/indra/llinventory/lltransactionflags.cpp @@ -95,16 +95,12 @@ std::string build_transfer_message_to_source( const LLUUID& dest_id, const std::string& dest_name, S32 transaction_type, - const char* desc) + const char* description) { - std::string description(ll_safe_string(desc)); lldebugs << "build_transfer_message_to_source: " << amount << " " << source_id << " " << dest_id << " " << dest_name << " " - << transaction_type << " " - << (description.empty()?"(no desc)":description.c_str()) - << llendl; - if(source_id.isNull()) return description; - if((0 == amount) && description.empty()) return description; + << (description?description:"(no desc)") << llendl; + if((0 == amount) || source_id.isNull()) return ll_safe_string(description); std::ostringstream ostr; if(dest_id.isNull()) { @@ -127,7 +123,7 @@ std::string build_transfer_message_to_source( else { ostr << "You paid " << dest_name << " L$" << amount; - append_reason(ostr, transaction_type, description.c_str()); + append_reason(ostr, transaction_type, description); } ostr << "."; return ostr.str(); @@ -143,8 +139,7 @@ std::string build_transfer_message_to_destination( { lldebugs << "build_transfer_message_to_dest: " << amount << " " << dest_id << " " << source_id << " " << source_name << " " - << transaction_type << " " << (description?description:"(no desc)") - << llendl; + << (description?description:"(no desc)") << llendl; if(0 == amount) return std::string(); if(dest_id.isNull()) return ll_safe_string(description); std::ostringstream ostr; -- cgit v1.2.3