diff options
author | Jacek Antonelli | 2008-08-15 23:44:57 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:44:57 -0500 |
commit | da68d3a57ecb27eba5d7efb8ff77d9640c0be65e (patch) | |
tree | f2fa2b9ed6e8cf49c8a3cb2a1893c4e5c61916a1 /linden/indra/llinventory | |
parent | Second Life viewer sources 1.15.1.3 (diff) | |
download | meta-impy-da68d3a57ecb27eba5d7efb8ff77d9640c0be65e.zip meta-impy-da68d3a57ecb27eba5d7efb8ff77d9640c0be65e.tar.gz meta-impy-da68d3a57ecb27eba5d7efb8ff77d9640c0be65e.tar.bz2 meta-impy-da68d3a57ecb27eba5d7efb8ff77d9640c0be65e.tar.xz |
Second Life viewer sources 1.16.0.5
Diffstat (limited to 'linden/indra/llinventory')
-rw-r--r-- | linden/indra/llinventory/llinventory_vc8.vcproj | 8 | ||||
-rw-r--r-- | linden/indra/llinventory/llparcel.h | 2 | ||||
-rw-r--r-- | linden/indra/llinventory/lltransactiontypes.h | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/linden/indra/llinventory/llinventory_vc8.vcproj b/linden/indra/llinventory/llinventory_vc8.vcproj index d66f352..2763cac 100644 --- a/linden/indra/llinventory/llinventory_vc8.vcproj +++ b/linden/indra/llinventory/llinventory_vc8.vcproj | |||
@@ -238,6 +238,10 @@ | |||
238 | > | 238 | > |
239 | </File> | 239 | </File> |
240 | <File | 240 | <File |
241 | RelativePath=".\llinventorytype.cpp" | ||
242 | > | ||
243 | </File> | ||
244 | <File | ||
241 | RelativePath=".\lllandmark.cpp" | 245 | RelativePath=".\lllandmark.cpp" |
242 | > | 246 | > |
243 | </File> | 247 | </File> |
@@ -284,6 +288,10 @@ | |||
284 | > | 288 | > |
285 | </File> | 289 | </File> |
286 | <File | 290 | <File |
291 | RelativePath=".\llinventorytype.h" | ||
292 | > | ||
293 | </File> | ||
294 | <File | ||
287 | RelativePath=".\lllandmark.h" | 295 | RelativePath=".\lllandmark.h" |
288 | > | 296 | > |
289 | </File> | 297 | </File> |
diff --git a/linden/indra/llinventory/llparcel.h b/linden/indra/llinventory/llparcel.h index cc20182..3144eb9 100644 --- a/linden/indra/llinventory/llparcel.h +++ b/linden/indra/llinventory/llparcel.h | |||
@@ -347,7 +347,7 @@ public: | |||
347 | void startSale(const LLUUID& buyer_id, BOOL is_buyer_group); | 347 | void startSale(const LLUUID& buyer_id, BOOL is_buyer_group); |
348 | 348 | ||
349 | // do the expiration logic, which needs to return values usable in | 349 | // do the expiration logic, which needs to return values usable in |
350 | // a money transaction. | 350 | // a L$ transaction. |
351 | void expireSale(U32& type, U8& flags, LLUUID& from_id, LLUUID& to_id); | 351 | void expireSale(U32& type, U8& flags, LLUUID& from_id, LLUUID& to_id); |
352 | void completeSale(U32& type, U8& flags, LLUUID& to_id); | 352 | void completeSale(U32& type, U8& flags, LLUUID& to_id); |
353 | void clearSale(); | 353 | void clearSale(); |
diff --git a/linden/indra/llinventory/lltransactiontypes.h b/linden/indra/llinventory/lltransactiontypes.h index 49ba6aa..6eaced9 100644 --- a/linden/indra/llinventory/lltransactiontypes.h +++ b/linden/indra/llinventory/lltransactiontypes.h | |||
@@ -35,7 +35,7 @@ | |||
35 | // insert into transaction_description | 35 | // insert into transaction_description |
36 | // set type = 1000, description = 'Object Claim'; | 36 | // set type = 1000, description = 'Object Claim'; |
37 | // | 37 | // |
38 | // Also add it to the various money string lookups on the dataserver | 38 | // Also add it to the various L$ string lookups on the dataserver |
39 | // in lldatamoney | 39 | // in lldatamoney |
40 | 40 | ||
41 | // Money transaction failure codes | 41 | // Money transaction failure codes |