diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-05-24 16:08:36 -0400 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-05-24 16:08:36 -0400 |
commit | a8470df2c433d2ce0376dde4f1a54b46ba9b01d7 (patch) | |
tree | 8f05bd3512209d0e4b0f189d4e4f95f06c622514 /indra/llinventory/llparcel.h | |
parent | 10c45691c7c48557f183cc9686f6a5c13c21a29d (diff) | |
parent | 79131e8a480ab3611ce739717ed84c6ad76aa234 (diff) |
merge
Diffstat (limited to 'indra/llinventory/llparcel.h')
-rw-r--r-- | indra/llinventory/llparcel.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/indra/llinventory/llparcel.h b/indra/llinventory/llparcel.h index 71b65d99ce..4893337967 100644 --- a/indra/llinventory/llparcel.h +++ b/indra/llinventory/llparcel.h @@ -34,7 +34,7 @@ #include "llpermissions.h" #include "lltimer.h" #include "v3math.h" - +#include "llaccountingquota.h" // Grid out of which parcels taken is stepped every 4 meters. const F32 PARCEL_GRID_STEP_METERS = 4.f; @@ -586,7 +586,11 @@ public: LLUUID getPreviousOwnerID() const { return mPreviousOwnerID; } BOOL getPreviouslyGroupOwned() const { return mPreviouslyGroupOwned; } BOOL getSellWithObjects() const { return (mParcelFlags & PF_SELL_PARCEL_OBJECTS) ? TRUE : FALSE; } - + + + void updateQuota( const LLUUID& objectId, const ParcelQuota& quota ); + const ParcelQuota& getQuota( void ) { return mQuota; } + protected: LLUUID mID; LLUUID mOwnerID; @@ -657,8 +661,9 @@ protected: BOOL mRegionPushOverride; BOOL mRegionDenyAnonymousOverride; BOOL mRegionDenyAgeUnverifiedOverride; - - + + ParcelQuota mQuota; + public: // HACK, make private S32 mLocalID; |