From c12331f0523c9249d79655ab3a96b010495a3982 Mon Sep 17 00:00:00 2001 From: Beq Date: Mon, 4 Nov 2024 02:23:07 +0000 Subject: [PATCH] FIRE-34805 - EEP-transition related crash Make the code more defensive for attempts to update a null. This is really treating the symptom though. --- indra/llinventory/llsettingsbase.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/indra/llinventory/llsettingsbase.cpp b/indra/llinventory/llsettingsbase.cpp index 7b55fbc9e8..852af7e46f 100644 --- a/indra/llinventory/llsettingsbase.cpp +++ b/indra/llinventory/llsettingsbase.cpp @@ -688,7 +688,14 @@ void LLSettingsBlender::update(const LLSettingsBase::BlendFactor& blendf) F64 res = setBlendFactor(blendf); llassert(res >= 0.0 && res <= 1.0); (void)res; - mTarget->update(); + // FIRE-34805 another issue with missing EEP on or shortly after login. + // Ideally we'll find the true fix at a higher level. But for now fix the symptom. + // mTarget->update(); + if(mTarget) + { + mTarget->update(); + } + // } F64 LLSettingsBlender::setBlendFactor(const LLSettingsBase::BlendFactor& blendf_in)