diff options
author | Don Kjer <don@lindenlab.com> | 2007-05-08 22:20:26 +0000 |
---|---|---|
committer | Don Kjer <don@lindenlab.com> | 2007-05-08 22:20:26 +0000 |
commit | a154ec72f759e20add6aacfab7f04e65b49051b9 (patch) | |
tree | 6410887f2466911a7a28574e7778d6fc7d416c67 /indra/llinventory | |
parent | 60a09f20f450ced238afc74e806d080b3c13cc33 (diff) |
svn merge -r 61343:61423 svn+ssh://svn/svn/linden/branches/maintenance into release
Diffstat (limited to 'indra/llinventory')
-rw-r--r-- | indra/llinventory/llparcel.h | 2 | ||||
-rw-r--r-- | indra/llinventory/lltransactiontypes.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llinventory/llparcel.h b/indra/llinventory/llparcel.h index 46c7a99400..af264731ad 100644 --- a/indra/llinventory/llparcel.h +++ b/indra/llinventory/llparcel.h @@ -327,7 +327,7 @@ public: void startSale(const LLUUID& buyer_id, BOOL is_buyer_group); // do the expiration logic, which needs to return values usable in - // a money transaction. + // a L$ transaction. void expireSale(U32& type, U8& flags, LLUUID& from_id, LLUUID& to_id); void completeSale(U32& type, U8& flags, LLUUID& to_id); void clearSale(); diff --git a/indra/llinventory/lltransactiontypes.h b/indra/llinventory/lltransactiontypes.h index d7894b2fdb..50710d6c83 100644 --- a/indra/llinventory/lltransactiontypes.h +++ b/indra/llinventory/lltransactiontypes.h @@ -15,7 +15,7 @@ // insert into transaction_description // set type = 1000, description = 'Object Claim'; // -// Also add it to the various money string lookups on the dataserver +// Also add it to the various L$ string lookups on the dataserver // in lldatamoney // Money transaction failure codes |