diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-05-24 17:09:01 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-05-24 17:09:01 -0700 |
| commit | acaf57100eade61262d73cf5b318c4545e921bd5 (patch) | |
| tree | 636955754701af7b1421aaf98b3feb59c15fba3f /indra/llinventory/llsettingsbase.cpp | |
| parent | 581869f2ca01aaa3349baef8785f1b26198d576e (diff) | |
switch track based on altitudes sent from region.
Diffstat (limited to 'indra/llinventory/llsettingsbase.cpp')
| -rw-r--r-- | indra/llinventory/llsettingsbase.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llinventory/llsettingsbase.cpp b/indra/llinventory/llsettingsbase.cpp index 411eaff8e3..d8e337e231 100644 --- a/indra/llinventory/llsettingsbase.cpp +++ b/indra/llinventory/llsettingsbase.cpp @@ -548,7 +548,7 @@ F64 LLSettingsBlender::setPosition(F64 blendf) blendf = llclamp(blendf, 0.0, 1.0); mTarget->replaceSettings(mInitial->getSettings()); - if (mIsTrivial || (blendf == 0.0)) + if (!mFinal || (mInitial == mFinal) || (blendf == 0.0)) { // this is a trivial blend. Results will be identical to the initial. return blendf; } |