Result of svn merge -r69150:69158 svn+ssh://svn/svn/linden/branches/named-queries-py3 into release.

1 files changed, 18 insertions, 0 deletions

diff --git a/indra/llinventory/lltransactionflags.h b/indra/llinventory/lltransactionflags.h
index eaa138fef7..999ab5f671 100644
--- a/indra/llinventory/lltransactionflags.h
+++ b/indra/llinventory/lltransactionflags.h
@@ -24,4 +24,22 @@ BOOL is_tf_source_group(TransactionFlags flags);
 BOOL is_tf_dest_group(TransactionFlags flags);
 BOOL is_tf_owner_group(TransactionFlags flags);
 
+// stupid helper functions which should be replaced with some kind of
+// internationalizeable message.
+std::string build_transfer_message_to_source(
+	S32 amount,
+	const LLUUID& source_id,
+	const LLUUID& dest_id,
+	const std::string& dest_name,
+	S32 transaction_type,
+	const char* description);
+
+std::string build_transfer_message_to_destination(
+	S32 amount,
+	const LLUUID& dest_id,
+	const LLUUID& source_id,
+	const std::string& source_name,
+	S32 transaction_type,
+	const char* description);
+
 #endif // LL_LLTRANSACTIONFLAGS_H