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

1 files changed, 10 insertions, 0 deletions

diff --git a/indra/llinventory/llparcel.cpp b/indra/llinventory/llparcel.cpp
index f53ef5e0ff..411c35ed6b 100644
--- a/indra/llinventory/llparcel.cpp
+++ b/indra/llinventory/llparcel.cpp
@@ -236,6 +236,7 @@ void LLParcel::init(const LLUUID &owner_id,
     mDayOffset = S64Seconds(LLSettingsDay::DEFAULT_DAYOFFSET);
     mIsDefaultDayCycle = true;
     mDayCycle.reset();
+    mDayCycleHash = 0;
 }
 
 void LLParcel::overrideOwner(const LLUUID& owner_id, BOOL is_group_owned)
@@ -1272,3 +1273,12 @@ U32 LLParcel::countExperienceKeyType( U32 type )
 		boost::end(mExperienceKeys | boost::adaptors::map_values), 
 		std::bind2nd(std::equal_to<U32>(), type));
 }
+
+void LLParcel::clearParcelDayCycleInfo()
+{
+    mDayLength = S64Seconds(LLSettingsDay::DEFAULT_DAYLENGTH);
+    mDayOffset = S64Seconds(LLSettingsDay::DEFAULT_DAYOFFSET);
+    mIsDefaultDayCycle = true;
+    mDayCycle.reset();
+    mDayCycleHash = 0;
+}