diff options
| author | Josh Bell <josh@lindenlab.com> | 2008-06-07 00:47:05 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2008-06-07 00:47:05 +0000 |
| commit | 290f2f05f7c2c061ba82f83594e4f7fb6a043ced (patch) | |
| tree | 648819527f93c4b398aaace5fb456afc983c2b15 /indra/llinventory/llparcel.h | |
| parent | 810a0b3dcee41ec657c94ccb26003b9b4e20e141 (diff) | |
svn merge -r 88991:89027 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-22-2-Server --> release
Due to the gnarly history of the source branch and merge history of release, combine with cmake header and gcc-fu, this was an "interesting" merge.
Diffstat (limited to 'indra/llinventory/llparcel.h')
| -rw-r--r-- | indra/llinventory/llparcel.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llinventory/llparcel.h b/indra/llinventory/llparcel.h index ac5e1a1eae..5d3a2b01ec 100644 --- a/indra/llinventory/llparcel.h +++ b/indra/llinventory/llparcel.h @@ -514,7 +514,7 @@ public: S32 getSimWidePrimCount() const { return mSimWidePrimCount; } // this parcel only (not simwide) - S32 getMaxPrimCapacity() const { return mMaxPrimCapacity; } + S32 getMaxPrimCapacity() const { return mMaxPrimCapacity; } // Does not include prim bonus S32 getPrimCount() const { return mOwnerPrimCount + mGroupPrimCount + mOtherPrimCount + mSelectedPrimCount; } S32 getOwnerPrimCount() const { return mOwnerPrimCount; } S32 getGroupPrimCount() const { return mGroupPrimCount; } @@ -525,7 +525,7 @@ public: S32 getCleanOtherTime() const { return mCleanOtherTime; } - void setMaxPrimCapacity(S32 max) { mMaxPrimCapacity = max; } + void setMaxPrimCapacity(S32 max) { mMaxPrimCapacity = max; } // Does not include prim bonus // simwide void setSimWideMaxPrimCapacity(S32 current) { mSimWideMaxPrimCapacity = current; } void setSimWidePrimCount(S32 current) { mSimWidePrimCount = current; } @@ -604,7 +604,7 @@ protected: F32 mPassHours; LLVector3 mAABBMin; LLVector3 mAABBMax; - S32 mMaxPrimCapacity; + S32 mMaxPrimCapacity; // Prims allowed on parcel, does not include prim bonus S32 mSimWidePrimCount; S32 mSimWideMaxPrimCapacity; //S32 mSimWidePrimCorrection; |