diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-06-19 16:46:12 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-06-19 16:46:12 -0700 |
| commit | 1f9b8f59afceeb8201780b679659f64845dcd7c1 (patch) | |
| tree | e2cb6d3d913c4de00c201c501ed22516d3205ebb /indra/llinventory/llsettingsbase.cpp | |
| parent | 8b9ff4487bdc4becef270197f86c6f0bbfd324d1 (diff) | |
Don't recalculate lighting every frame. Fix altitude transitions. On track switch ignore time threshold on blender.
Diffstat (limited to 'indra/llinventory/llsettingsbase.cpp')
| -rw-r--r-- | indra/llinventory/llsettingsbase.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llinventory/llsettingsbase.cpp b/indra/llinventory/llsettingsbase.cpp index 24e808c92a..db30a25a4c 100644 --- a/indra/llinventory/llsettingsbase.cpp +++ b/indra/llinventory/llsettingsbase.cpp @@ -610,10 +610,12 @@ void LLSettingsBlenderTimeDelta::applyTimeDelta(const LLSettingsBase::Seconds& t if (mTimeSpent > mBlendSpan) { + mIgnoreTimeDelta = false; triggerComplete(); return; } - if (mTimeDeltaPassed < mTimeDeltaThreshold) + + if ((mTimeDeltaPassed < mTimeDeltaThreshold) && (!mIgnoreTimeDelta)) { return; } |