diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-08-08 15:41:28 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-08-08 15:41:28 -0700 |
| commit | 881ee670d92f13ac518a74e1bff81bf69e07ccfa (patch) | |
| tree | 23d96163b2aac869bd6ec64b32b8f1fc79d0c7dd /indra/llinventory | |
| parent | 51abc168c03f80d63c85d4bb48624f440b585390 (diff) | |
Fix for mac build
MAINT-8870, MAINT-8871: When legacy windlight fails load the default day cycle asset and use that.
Diffstat (limited to 'indra/llinventory')
| -rw-r--r-- | indra/llinventory/llsettingsdaycycle.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llinventory/llsettingsdaycycle.cpp b/indra/llinventory/llsettingsdaycycle.cpp index 320e090bfd..84ef145913 100644 --- a/indra/llinventory/llsettingsdaycycle.cpp +++ b/indra/llinventory/llsettingsdaycycle.cpp @@ -304,8 +304,8 @@ bool LLSettingsDay::initialize(bool validate_frames) iter = mDayTracks[i].begin(); } - if ((iter->first >= (new_frame - DEFAULT_MULTISLIDER_INCREMENT) && (new_frame + DEFAULT_FRAME_SLOP_FACTOR) >= iter->first) - || iter->first < new_frame && (new_frame + DEFAULT_FRAME_SLOP_FACTOR) >= (iter->first + 1)) + if (((iter->first >= (new_frame - DEFAULT_MULTISLIDER_INCREMENT)) && ((new_frame + DEFAULT_FRAME_SLOP_FACTOR) >= iter->first)) + || ((iter->first < new_frame) && ((new_frame + DEFAULT_FRAME_SLOP_FACTOR) >= (iter->first + 1)))) { // we are encroaching at new point as well found = iter->first; |