diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-01-25 17:21:25 -0800 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-01-25 17:21:25 -0800 |
| commit | fbd8a98300277bdbc1885c25eea290560fd8c6c1 (patch) | |
| tree | 93279d01ba2db5ba25d7fdffe69f46df29e8ed3b /indra/llinventory/llparcel.h | |
| parent | 9b05a8d1cde1d54e60bf4ead021372427c7d11fd (diff) | |
Selects correct day cycle. Fix an error validating legacy daycycles.
Diffstat (limited to 'indra/llinventory/llparcel.h')
| -rw-r--r-- | indra/llinventory/llparcel.h | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/indra/llinventory/llparcel.h b/indra/llinventory/llparcel.h index 7b4647cc5f..6bbd5a949d 100644 --- a/indra/llinventory/llparcel.h +++ b/indra/llinventory/llparcel.h @@ -591,14 +591,17 @@ public: BOOL getPreviouslyGroupOwned() const { return mPreviouslyGroupOwned; } BOOL getSellWithObjects() const { return (mParcelFlags & PF_SELL_PARCEL_OBJECTS) ? TRUE : FALSE; } - S64Seconds getDayLength() const { return mDayLength; } - void setDayLength(S64SecondsImplicit seconds) { mDayLength = seconds; } - S64Seconds getDayOffset() const { return mDayOffset; } - void setDayOffset(S64SecondsImplicit seconds) { mDayOffset = seconds; } - bool getUsesDefaultDayCycle() const { return mIsDefaultDayCycle; } - void setUsesDefaultDayCycle(bool isdefault) { mIsDefaultDayCycle = isdefault; } - LLSettingsDay::ptr_t getParcelDayCycle() const { return mDayCycle; } - void setParcelDayCycle(const LLSettingsDay::ptr_t &pday) { mDayCycle = pday; } + S64Seconds getDayLength() const { return mDayLength; } + void setDayLength(S64SecondsImplicit seconds) { mDayLength = seconds; } + S64Seconds getDayOffset() const { return mDayOffset; } + void setDayOffset(S64SecondsImplicit seconds) { mDayOffset = seconds; } + bool getUsesDefaultDayCycle() const { return mIsDefaultDayCycle; } + void setUsesDefaultDayCycle(bool isdefault) { mIsDefaultDayCycle = isdefault; } + LLSettingsDay::ptr_t getParcelDayCycle() const { return mDayCycle; } + void setParcelDayCycle(const LLSettingsDay::ptr_t &pday) { mDayCycle = pday; } + size_t getParcelDayCycleHash() const { return mDayCycleHash; } + void setParcelDayCycleHash(size_t hash) { mDayCycleHash = hash; } + void clearParcelDayCycleInfo(); protected: LLUUID mID; @@ -678,6 +681,7 @@ protected: S64Seconds mDayOffset; bool mIsDefaultDayCycle; LLSettingsDay::ptr_t mDayCycle; + size_t mDayCycleHash; public: // HACK, make private |