Selects correct day cycle. Fix an error validating legacy daycycles.

1 files changed, 11 insertions, 8 deletions

diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h
index fef78e29a9..71d4d85ade 100644
--- a/indra/newview/llviewerregion.h
+++ b/indra/newview/llviewerregion.h
@@ -390,14 +390,16 @@ public:
 
     static BOOL isNewObjectCreationThrottleDisabled() { return sNewObjectCreationThrottle < 0; }
 
-    S64Seconds getDayLength() const { return mDayLength; }
-    void setDayLength(S64SecondsImplicit seconds) { mDayLength = seconds; }
-    S64Seconds getDayOffset() const { return mDayOffset; }
-    void setDayOffset(S64SecondsImplicit seconds) { mDayOffset = seconds; }
-    bool getIsDefaultDayCycle() const { return mIsDefaultDayCycle; }
-    void setIsDefaultDayCycle(bool isdefault) { mIsDefaultDayCycle = isdefault; }
-    LLSettingsDay::ptr_t getRegionDayCycle() const { return mDayCycle; }
-    void setRegionDayCycle(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        getIsDefaultDayCycle() const                { return mIsDefaultDayCycle; }
+    void        setIsDefaultDayCycle(bool isdefault)       { mIsDefaultDayCycle = isdefault; }
+    LLSettingsDay::ptr_t getRegionDayCycle() const          { return mDayCycle; }
+    void        setRegionDayCycle(const LLSettingsDay::ptr_t &pday) { mDayCycle = pday; }
+    size_t      getRegionDayCycleHash() const               { return mDayCycleHash; }
+    void        setRegionDayCycleHash(size_t hash)          { mDayCycleHash = hash; }
 
 private:
 	void addToVOCacheTree(LLVOCacheEntry* entry);
@@ -542,6 +544,7 @@ private:
     S64Seconds            mDayOffset;
     bool                  mIsDefaultDayCycle;
     LLSettingsDay::ptr_t  mDayCycle;
+    size_t                mDayCycleHash;
 
 	class CacheMissItem
 	{