diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-01-30 16:42:34 -0800 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-01-30 16:42:34 -0800 |
| commit | 0bf50e2f8cfa5f3ccd6165ce935cf0fd9c174ced (patch) | |
| tree | 4a161b5eaa5150775f13869d3d32ad5ae83d5904 /indra/llinventory/llsettingsbase.cpp | |
| parent | fbd8a98300277bdbc1885c25eea290560fd8c6c1 (diff) | |
Cleanup on daycyle selection and stack. Move blenders into environment.
(Transition bronken, instant only. Shaddows moved based on region, not parcel)
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 a35504e0e6..ffeae8677f 100644 --- a/indra/llinventory/llsettingsbase.cpp +++ b/indra/llinventory/llsettingsbase.cpp @@ -592,12 +592,12 @@ void LLSettingsBlender::update(F64Seconds timedelta) { LLSettingsBlender::ptr_t hold = shared_from_this(); // prevents this from deleting too soon mOnFinished(shared_from_this()); - mOnFinished.disconnect_all_slots(); // prevent from firing more than once. return; } F64 blendf = fmod(mTimeSpent.value(), mSeconds.value()) / mSeconds.value(); + //_WARNS("LAPRAS") << "blending at " << (blendf * 100.0f) << "%" << LL_ENDL; mTarget->replaceSettings(mInitial->getSettings()); mTarget->blend(mFinal, blendf); } |
