From 7381679cd0f77a2b91b2fce5f0060afc2d359f5a Mon Sep 17 00:00:00 2001
From: James Cook <james@cookmd.com>
Date: Thu, 1 Apr 2010 10:15:37 -0700
Subject: Add TransactionInfo to MoneyBalanceReply, unpack test data

---
 scripts/messages/message_template.msg | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(limited to 'scripts')

diff --git a/scripts/messages/message_template.msg b/scripts/messages/message_template.msg
index d4f791c202..1080d140dc 100644
--- a/scripts/messages/message_template.msg
+++ b/scripts/messages/message_template.msg
@@ -6812,6 +6812,18 @@ version 2.0
 		{	SquareMetersCommitted	S32	}
 		{	Description			Variable 1	}	// string
 	}
+	// For replies that are part of a transaction (buying something) provide
+	// metadata for localization.  If TransactionType is 0, the message is
+	// purely a balance update.  Added for server 1.40 and viewer 2.1.  JC
+	{
+		TransactionInfo		Single
+		{	TransactionType			S32			}	// lltransactiontype.h
+		{	TransactionFlags		U32			}	// lltransactionflags.h
+		{	SourceID				LLUUID		}
+		{	DestID					LLUUID		}
+		{	Amount					S32			}
+		{	ItemDescription			Variable 1	}	// string
+	}
 }
 
 
@@ -6838,6 +6850,16 @@ version 2.0
 		{	SquareMetersCommitted	S32	}
 		{	Description			Variable 1	}	// string
 	}
+	// See MoneyBalanceReply above.
+	{
+		TransactionInfo		Single
+		{	TransactionType			S32			}	// lltransactiontype.h
+		{	TransactionFlags		U32			}	// lltransactionflags.h
+		{	SourceID				LLUUID		}
+		{	DestID					LLUUID		}
+		{	Amount					S32			}
+		{	ItemDescription			Variable 1	}	// string
+	}
 }
 
 
@@ -8972,5 +8994,7 @@ version 2.0
 		{	InvType			S8	}
 		{	Name			Variable	1	}
 		{	Description		Variable	1	}
+
 	}
 }
+
-- 
cgit v1.3


From 71dfe17fd16500cbb124a53611472174972df37a Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Fri, 2 Apr 2010 09:45:17 -0700
Subject: Updated to latest MoneyBalanceReply message format

---
 indra/newview/llviewermessage.cpp     | 9 ++++++---
 scripts/messages/message_template.msg | 6 ++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'scripts')

diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 8b762eadac..8f68c34736 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -4613,20 +4613,23 @@ void process_money_balance_reply( LLMessageSystem* msg, void** )
     // Added in server 1.40 and viewer 2.1, support for localization
     // and agent ids for name lookup.
     S32 transaction_type = 0;
-    U32 transaction_flags = 0;
     LLUUID source_id;
+	BOOL is_source_group = FALSE;
     LLUUID dest_id;
+	BOOL is_dest_group = FALSE;
     S32 amount = 0;
     std::string item_description;
     if (msg->has("TransactionInfo"))
     {
         msg->getS32("TransactionInfo", "TransactionType", transaction_type);
-        msg->getU32("TransactionInfo", "TransactionFlags", transaction_flags);
         msg->getUUID("TransactionInfo", "SourceID", source_id);
+		msg->getBOOL("TransactionInfo", "IsSourceGroup", is_source_group);
         msg->getUUID("TransactionInfo", "DestID", dest_id);
+		msg->getBOOL("TransactionInfo", "IsDestGroup", is_dest_group);
         msg->getS32("TransactionInfo", "Amount", amount);
         msg->getString("TransactionInfo", "ItemDescription", item_description);
-        llinfos << "JAMESDEBUG ItemDescription " << item_description << llendl;
+        llinfos << "JAMESDEBUG money_balance_reply source " << source_id 
+			<< " item " << item_description << llendl;
     }
     
 	if (gStatusBar)
diff --git a/scripts/messages/message_template.msg b/scripts/messages/message_template.msg
index 1080d140dc..77dc940335 100644
--- a/scripts/messages/message_template.msg
+++ b/scripts/messages/message_template.msg
@@ -6818,9 +6818,10 @@ version 2.0
 	{
 		TransactionInfo		Single
 		{	TransactionType			S32			}	// lltransactiontype.h
-		{	TransactionFlags		U32			}	// lltransactionflags.h
 		{	SourceID				LLUUID		}
+		{	IsSourceGroup			BOOL		}
 		{	DestID					LLUUID		}
+		{	IsDestGroup				BOOL		}
 		{	Amount					S32			}
 		{	ItemDescription			Variable 1	}	// string
 	}
@@ -6854,9 +6855,10 @@ version 2.0
 	{
 		TransactionInfo		Single
 		{	TransactionType			S32			}	// lltransactiontype.h
-		{	TransactionFlags		U32			}	// lltransactionflags.h
 		{	SourceID				LLUUID		}
+		{	IsSourceGroup			BOOL		}
 		{	DestID					LLUUID		}
+		{	IsDestGroup				BOOL		}
 		{	Amount					S32			}
 		{	ItemDescription			Variable 1	}	// string
 	}
-- 
cgit v1.3