summaryrefslogtreecommitdiff
path: root/indra/llinventory/llparcel.h
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2018-01-16 11:03:26 -0800
committerRider Linden <rider@lindenlab.com>2018-01-16 11:03:26 -0800
commita0c228d84240a80437b63e0a2cd1cee24e8004a0 (patch)
tree76cd50d1e2bdca458af102c4cfd4a32d478a1f4d /indra/llinventory/llparcel.h
parent8211f57205f0008d8ffb9bfcd465ca26d906e19c (diff)
MAINT-8052: Report if the returned environment is the default.
Diffstat (limited to 'indra/llinventory/llparcel.h')
-rw-r--r--indra/llinventory/llparcel.h17
1 files changed, 15 insertions, 2 deletions
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;