diff options
author | Dave Parks <davep@lindenlab.com> | 2012-03-09 15:50:51 -0600 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2012-03-09 15:50:51 -0600 |
commit | 8e60cdb3335ec198c71b29d37ab08c4aff9f8223 (patch) | |
tree | 2e043ee721d725dcc8d654a8f51eaafaaeb423de /indra/llinventory/llparcel.h | |
parent | 1d200c56e151eb8fc384693175d1b9318ff0f919 (diff) | |
parent | 4b20d72a991cfebaf5765fe7756190f4a9645a3b (diff) |
merge
Diffstat (limited to 'indra/llinventory/llparcel.h')
-rw-r--r-- | indra/llinventory/llparcel.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/llinventory/llparcel.h b/indra/llinventory/llparcel.h index ff35caab4c..e36d0b20d2 100644 --- a/indra/llinventory/llparcel.h +++ b/indra/llinventory/llparcel.h @@ -34,7 +34,6 @@ #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; @@ -603,9 +602,6 @@ public: 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; @@ -681,7 +677,6 @@ protected: BOOL mAllowGroupAVSounds; BOOL mAllowAnyAVSounds; - ParcelQuota mQuota; public: // HACK, make private |