summaryrefslogtreecommitdiff
path: root/indra/llinventory/llparcel.h
diff options
context:
space:
mode:
authorAaron Brashears <aaronb@lindenlab.com>2009-05-18 23:38:35 +0000
committerAaron Brashears <aaronb@lindenlab.com>2009-05-18 23:38:35 +0000
commit6df2755ba6b24d0cefd52ce175b0212dd46c9b10 (patch)
tree833bc29e7bd5438eb89f34119ae157efe6258b2c /indra/llinventory/llparcel.h
parent0257214763203708e8e29d09346e777b95cdfce6 (diff)
Result of svn merge -r119432:120464 svn+ssh://svn/svn/linden/branches/http_database/merge-03 into trunk. QAR-1462
Diffstat (limited to 'indra/llinventory/llparcel.h')
-rw-r--r--indra/llinventory/llparcel.h8
1 files changed, 0 insertions, 8 deletions
diff --git a/indra/llinventory/llparcel.h b/indra/llinventory/llparcel.h
index 6f5ae87ebd..40bbb7b2e0 100644
--- a/indra/llinventory/llparcel.h
+++ b/indra/llinventory/llparcel.h
@@ -413,12 +413,6 @@ public:
void completeSale(U32& type, U8& flags, LLUUID& to_id);
void clearSale();
- // this function returns TRUE if the parcel needs conversion to a
- // lease from a non-owned-status state.
- BOOL getRecordTransaction() const { return mRecordTransaction; }
- void setRecordTransaction(BOOL record) { mRecordTransaction = record; }
-
-
// more accessors
U32 getParcelFlags() const { return mParcelFlags; }
@@ -596,8 +590,6 @@ protected:
ELandingType mLandingType;
LLTimer mSaleTimerExpires;
S32 mGraceExtension;
- BOOL mRecordTransaction;
-
// This value is non-zero if there is an auction associated with
// the parcel.