summaryrefslogtreecommitdiff
path: root/indra/llinventory/llsettingsbase.cpp
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2018-11-02 22:34:20 +0100
committerGraham Linden <graham@lindenlab.com>2018-11-02 22:34:20 +0100
commite0a1b46e6129a0e6ca62efe18882889db96c572f (patch)
treed63f5d79302741627a7c3ae4e0de7cc1b1b22ad1 /indra/llinventory/llsettingsbase.cpp
parent3494fa3cfe50a0152ff9f66885a17e0adbaaf221 (diff)
parent8d333a0176d56738154c75b1a24d694467647312 (diff)
Merge
Diffstat (limited to 'indra/llinventory/llsettingsbase.cpp')
-rw-r--r--indra/llinventory/llsettingsbase.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llinventory/llsettingsbase.cpp b/indra/llinventory/llsettingsbase.cpp
index 4b8be04355..7917fa96f1 100644
--- a/indra/llinventory/llsettingsbase.cpp
+++ b/indra/llinventory/llsettingsbase.cpp
@@ -688,6 +688,7 @@ F64 LLSettingsBlender::setBlendFactor(const LLSettingsBase::BlendFactor& blendf_
return blendf;
}
mTarget->blend(mFinal, blendf);
+ mTarget->update();
}
else
{
@@ -702,6 +703,7 @@ void LLSettingsBlender::triggerComplete()
if (mTarget)
mTarget->replaceSettings(mFinal->getSettings());
LLSettingsBlender::ptr_t hold = shared_from_this(); // prevents this from deleting too soon
+ mTarget->update();
mOnFinished(shared_from_this());
}