diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2024-09-11 18:21:03 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2024-09-11 22:56:57 +0300 |
| commit | 0a110ff0833216b167e032987b0d676f29ad0ee5 (patch) | |
| tree | 47ba8f60de579a8a56b46e778d25e4aa6ef2f13c /indra/llinventory/llsettingsbase.cpp | |
| parent | 047eb16f4c8fdfb1826136db9ee2eed83cb95416 (diff) | |
viewer#2529 Track interpolateSDMap's performance
viewer#2529 Fix initialization
Diffstat (limited to 'indra/llinventory/llsettingsbase.cpp')
| -rw-r--r-- | indra/llinventory/llsettingsbase.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llinventory/llsettingsbase.cpp b/indra/llinventory/llsettingsbase.cpp index 8575ac6920..f7151403b4 100644 --- a/indra/llinventory/llsettingsbase.cpp +++ b/indra/llinventory/llsettingsbase.cpp @@ -69,23 +69,21 @@ const U32 LLSettingsBase::Validator::VALIDATION_PARTIAL(0x01 << 0); LLSettingsBase::LLSettingsBase(): mSettings(LLSD::emptyMap()), mDirty(true), - mLLSDDirty(false), + mLLSDDirty(true), mReplaced(false), mBlendedFactor(0.0), mSettingFlags(0) { - loadValuesFromLLSD(); } LLSettingsBase::LLSettingsBase(const LLSD setting) : mSettings(setting), - mLLSDDirty(false), + mLLSDDirty(true), mDirty(true), mReplaced(false), mBlendedFactor(0.0), mSettingFlags(0) { - loadValuesFromLLSD(); } //virtual @@ -134,6 +132,7 @@ void LLSettingsBase::saveValuesIfNeeded() //========================================================================= void LLSettingsBase::lerpSettings(LLSettingsBase &other, F64 mix) { + LL_PROFILE_ZONE_SCOPED_CATEGORY_ENVIRONMENT; saveValuesIfNeeded(); stringset_t skip = getSkipInterpolateKeys(); stringset_t slerps = getSlerpKeys(); @@ -437,6 +436,7 @@ bool LLSettingsBase::validate() saveValuesIfNeeded(); LLSD result = LLSettingsBase::settingValidation(mSettings, validations); + loadValuesFromLLSD(); if (result["errors"].size() > 0) { |