diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/install.py | 12 | ||||
| -rw-r--r-- | scripts/messages/message_template.msg | 26 | 
2 files changed, 26 insertions, 12 deletions
| 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): diff --git a/scripts/messages/message_template.msg b/scripts/messages/message_template.msg index d4f791c202..77dc940335 100644 --- a/scripts/messages/message_template.msg +++ b/scripts/messages/message_template.msg @@ -6812,6 +6812,19 @@ 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 +		{	SourceID				LLUUID		} +		{	IsSourceGroup			BOOL		} +		{	DestID					LLUUID		} +		{	IsDestGroup				BOOL		} +		{	Amount					S32			} +		{	ItemDescription			Variable 1	}	// string +	}  } @@ -6838,6 +6851,17 @@ version 2.0  		{	SquareMetersCommitted	S32	}  		{	Description			Variable 1	}	// string  	} +	// See MoneyBalanceReply above. +	{ +		TransactionInfo		Single +		{	TransactionType			S32			}	// lltransactiontype.h +		{	SourceID				LLUUID		} +		{	IsSourceGroup			BOOL		} +		{	DestID					LLUUID		} +		{	IsDestGroup				BOOL		} +		{	Amount					S32			} +		{	ItemDescription			Variable 1	}	// string +	}  } @@ -8972,5 +8996,7 @@ version 2.0  		{	InvType			S8	}  		{	Name			Variable	1	}  		{	Description		Variable	1	} +  	}  } + | 
