diff options
| author | Kartic Krishnamurthy <drunkensufi@lindenlab.com> | 2008-08-21 22:09:21 +0000 |
|---|---|---|
| committer | Kartic Krishnamurthy <drunkensufi@lindenlab.com> | 2008-08-21 22:09:21 +0000 |
| commit | cb7abfd595a0be6a36dd3ad8dbec0d9f053210a6 (patch) | |
| tree | 284e3a8d261beb3992d262b40fa54e09181273c5 /indra/llinventory | |
| parent | 30638bb110b2adf64057f9dbf893ab2d48f10e3e (diff) | |
Master QAR-807 passed.
Sub-QARs
1. QAR-765 Rad chilies 04 to Release
2. QAR-799 Merge PHP Framework 4 changes to release
3. QAR-801 Merge Buildme for startlocationfix
svn merge -r93906:94028 svn+ssh://svn/svn/linden/branches/combo-merge-qar-765-799 .
Diffstat (limited to 'indra/llinventory')
| -rw-r--r-- | indra/llinventory/llparcel.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/indra/llinventory/llparcel.cpp b/indra/llinventory/llparcel.cpp index 489798910d..3607318d7f 100644 --- a/indra/llinventory/llparcel.cpp +++ b/indra/llinventory/llparcel.cpp @@ -1761,7 +1761,11 @@ void LLParcel::startSale(const LLUUID& buyer_id, BOOL is_buyer_group) setCleanOtherTime(0); } -void LLParcel::expireSale(U32& type, U8& flags, LLUUID& from_id, LLUUID& to_id) +void LLParcel::expireSale( + U32& type, + U8& flags, + LLUUID& from_id, + LLUUID& to_id) { mSaleTimerExpires.setTimerExpirySec(0.0); mSaleTimerExpires.stop(); @@ -1777,8 +1781,10 @@ void LLParcel::expireSale(U32& type, U8& flags, LLUUID& from_id, LLUUID& to_id) to_id.setNull(); } -void LLParcel::completeSale(U32& type, U8& flags, - LLUUID& to_id) +void LLParcel::completeSale( + U32& type, + U8& flags, + LLUUID& to_id) { mSaleTimerExpires.setTimerExpirySec(0.0); mSaleTimerExpires.stop(); |