diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-01-04 14:43:45 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-01-04 14:43:45 -0500 |
| commit | 197a1ddef8a0b7bc7872339ec82b2a5bc5cbb3b4 (patch) | |
| tree | 31b2bf3eeb026334ed20cd6e4f8fb15f91a07b0f /indra/newview/llenvironment.h | |
| parent | 5a6174c0853f5a140343725312f2b63b42f2bbad (diff) | |
| parent | a592292242e29d0379ee72572a434359e1e892d1 (diff) | |
DRTVWR-589: Merge branch 'main' into DRTVWR-589
Diffstat (limited to 'indra/newview/llenvironment.h')
| -rw-r--r-- | indra/newview/llenvironment.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llenvironment.h b/indra/newview/llenvironment.h index 1c8a68ae02..408952bb5b 100644 --- a/indra/newview/llenvironment.h +++ b/indra/newview/llenvironment.h @@ -63,6 +63,7 @@ public: static const LLUUID KNOWN_SKY_SUNRISE; static const LLUUID KNOWN_SKY_MIDDAY; + static const LLUUID KNOWN_SKY_LEGACY_MIDDAY; static const LLUUID KNOWN_SKY_SUNSET; static const LLUUID KNOWN_SKY_MIDNIGHT; @@ -265,7 +266,7 @@ public: virtual bool applyTimeDelta(const LLSettingsBase::Seconds& delta); virtual void setDay(const LLSettingsDay::ptr_t &pday, LLSettingsDay::Seconds daylength, LLSettingsDay::Seconds dayoffset); - virtual void setSky(const LLSettingsSky::ptr_t &psky); + bool setSky(const LLSettingsSky::ptr_t &psky); virtual void setWater(const LLSettingsWater::ptr_t &pwater); void initialize(); |