MAINT-8052: Report if the returned environment is the default.

3 files changed, 20 insertions, 3 deletions

diff --git a/indra/llinventory/llparcel.cpp b/indra/llinventory/llparcel.cpp
index 0908613c10..f53ef5e0ff 100644
--- a/indra/llinventory/llparcel.cpp
+++ b/indra/llinventory/llparcel.cpp
@@ -231,6 +231,11 @@ void LLParcel::init(const LLUUID &owner_id,
 	setAllowGroupAVSounds(TRUE);
 	setAllowAnyAVSounds(TRUE);
 	setHaveNewParcelLimitData(FALSE);
+
+    mDayLength = S64Seconds(LLSettingsDay::DEFAULT_DAYLENGTH);
+    mDayOffset = S64Seconds(LLSettingsDay::DEFAULT_DAYOFFSET);
+    mIsDefaultDayCycle = true;
+    mDayCycle.reset();
 }
 
 void LLParcel::overrideOwner(const LLUUID& owner_id, BOOL is_group_owned)
diff --git a/indra/llinventory/llparcel.h b/indra/llinventory/llparcel.h
index 135d0ca7b9..dada2cf6d8 100644
--- a/indra/llinventory/llparcel.h
+++ b/indra/llinventory/llparcel.h
@@ -34,6 +34,7 @@
 #include "llpermissions.h"
 #include "lltimer.h"
 #include "v3math.h"
+#include "llsettingsdaycycle.h"
 
 // Grid out of which parcels taken is stepped every 4 meters.
 const F32 PARCEL_GRID_STEP_METERS	= 4.f;
@@ -590,7 +591,15 @@ 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 getIsDefaultDayCycle() const                           { return mIsDefaultDayCycle; }
+    void setIsDefaultDayCycle(bool isdefault)                  { mIsDefaultDayCycle = isdefault; }
+    LLSettingsDay::ptr_t getParcelDayCycle() const              { return mDayCycle; }
+    void setParcelDayCycle(const LLSettingsDay::ptr_t &pday)    { mDayCycle = pday; }
+
 protected:
 	LLUUID mID;
 	LLUUID				mOwnerID;
@@ -665,7 +674,11 @@ protected:
 	BOOL				mAllowGroupAVSounds;
 	BOOL				mAllowAnyAVSounds;
 	
-	
+    S64Seconds          mDayLength;
+    S64Seconds          mDayOffset;
+    bool                mIsDefaultDayCycle;
+    LLSettingsDay::ptr_t mDayCycle;
+
 public:
 	// HACK, make private
 	S32					mLocalID;
diff --git a/indra/llinventory/llsettingsdaycycle.cpp b/indra/llinventory/llsettingsdaycycle.cpp
index 180992cd29..4207df0924 100644
--- a/indra/llinventory/llsettingsdaycycle.cpp
+++ b/indra/llinventory/llsettingsdaycycle.cpp
@@ -432,7 +432,6 @@ void LLSettingsDay::updateSettings()
 {
     static LLFrameTimer timer;
 
-
     F64Seconds delta(timer.getElapsedTimeAndResetF32());
 
     if (mSkyBlender)