From 7381679cd0f77a2b91b2fce5f0060afc2d359f5a Mon Sep 17 00:00:00 2001 From: James Cook 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.2.3 From 71dfe17fd16500cbb124a53611472174972df37a Mon Sep 17 00:00:00 2001 From: James Cook Date: Fri, 2 Apr 2010 09:45:17 -0700 Subject: Updated to latest MoneyBalanceReply message format --- scripts/messages/message_template.msg | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'scripts') 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.2.3 From a36033853a7d567e92713a0392b29754521f338b Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Thu, 16 Sep 2010 14:27:42 -0700 Subject: STORM-168 : Python modules cleanup --- scripts/install.py | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'scripts') diff --git a/scripts/install.py b/scripts/install.py index 7368af0b37..c2adf4d0a2 100755 --- a/scripts/install.py +++ b/scripts/install.py @@ -84,18 +84,6 @@ except ImportError: from indra.base import llsd from indra.util import helpformatter -# *HACK: Necessary for python 2.3. Consider removing this code wart -# after etch has deployed everywhere. 2008-12-23 Phoenix -try: - sorted = sorted -except NameError: - def sorted(in_list): - "Return a list which is a sorted copy of in_list." - # Copy the source to be more functional and side-effect free. - out_list = copy.copy(in_list) - out_list.sort() - return out_list - class InstallFile(object): "This is just a handy way to throw around details on a file in memory." def __init__(self, pkgname, url, md5sum, cache_dir, platform_path): -- cgit v1.2.3 From 0670e889f93ffaee1ea103fcd4a54d1217b67bfd Mon Sep 17 00:00:00 2001 From: "Christian Goetze (CG)" Date: Tue, 16 Nov 2010 12:15:00 -0800 Subject: Replace template verification code with an md5sum check. --- scripts/md5check.py | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100755 scripts/md5check.py (limited to 'scripts') diff --git a/scripts/md5check.py b/scripts/md5check.py new file mode 100755 index 0000000000..951fe0105c --- /dev/null +++ b/scripts/md5check.py @@ -0,0 +1,61 @@ +#!/usr/bin/python +"""\ +@file md5check.py +@brief Replacement for message template compatibility verifier. + +$LicenseInfo:firstyear=20i10&license=viewergpl$ +Copyright (c) 2010, 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://secondlifegrid.net/programs/open_source/licensing/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://secondlifegrid.net/programs/open_source/licensing/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$ +""" + +import sys +import hashlib + +if len(sys.argv) != 3: + print """Usage: %s --create| + +Creates an md5sum hash digest of the specified file content +and compares it with the given hash digest. + +If --create is used instead of a hash digest, it will simply +print out the hash digest of specified file content. +""" % sys.argv[0] + sys.exit(1) + +if sys.argv[2] == '-': + fh = sys.stdin + filename = "" +else: + filename = sys.argv[2] + fh = open(filename) + +hexdigest = hashlib.md5(fh.read()).hexdigest() +if sys.argv[1] == '--create': + print hexdigest +elif hexdigest == sys.argv[1]: + print "md5sum check passed:", filename +else: + print "md5sum check FAILED:", filename + sys.exit(1) -- cgit v1.2.3