summaryrefslogtreecommitdiff
path: root/indra/newview/llenvironment.h
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2018-05-24 17:09:01 -0700
committerRider Linden <rider@lindenlab.com>2018-05-24 17:09:01 -0700
commitacaf57100eade61262d73cf5b318c4545e921bd5 (patch)
tree636955754701af7b1421aaf98b3feb59c15fba3f /indra/newview/llenvironment.h
parent581869f2ca01aaa3349baef8785f1b26198d576e (diff)
switch track based on altitudes sent from region.
Diffstat (limited to 'indra/newview/llenvironment.h')
-rw-r--r--indra/newview/llenvironment.h21
1 files changed, 11 insertions, 10 deletions
diff --git a/indra/newview/llenvironment.h b/indra/newview/llenvironment.h
index cdfac34d90..398c97ebe9 100644
--- a/indra/newview/llenvironment.h
+++ b/indra/newview/llenvironment.h
@@ -61,18 +61,18 @@ public:
typedef std::shared_ptr<EnvironmentInfo> ptr_t;
- S32 mParcelId;
- LLUUID mRegionId;
- S64Seconds mDayLength;
- S64Seconds mDayOffset;
- size_t mDayHash;
- LLSD mDaycycleData;
- LLSD mAltitudes;
- bool mIsDefault;
- bool mIsRegion;
+ S32 mParcelId;
+ LLUUID mRegionId;
+ S64Seconds mDayLength;
+ S64Seconds mDayOffset;
+ size_t mDayHash;
+ LLSD mDaycycleData;
+ std::array<F32, 4> mAltitudes;
+ bool mIsDefault;
+ bool mIsRegion;
- static ptr_t extract(LLSD);
+ static ptr_t extract(LLSD);
};
@@ -338,6 +338,7 @@ private:
change_signal_t mDayCycleListChange;
S32 mCurrentTrack;
+ std::array<F32, 4> mTrackAltitudes;
DayInstance::ptr_t getEnvironmentInstance(EnvSelection_t env, bool create = false);