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/llsettingswater.cpp | |
| parent | 047eb16f4c8fdfb1826136db9ee2eed83cb95416 (diff) | |
viewer#2529 Track interpolateSDMap's performance
viewer#2529 Fix initialization
Diffstat (limited to 'indra/llinventory/llsettingswater.cpp')
| -rw-r--r-- | indra/llinventory/llsettingswater.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llinventory/llsettingswater.cpp b/indra/llinventory/llsettingswater.cpp index 6127a523ae..cad0b41d67 100644 --- a/indra/llinventory/llsettingswater.cpp +++ b/indra/llinventory/llsettingswater.cpp @@ -70,12 +70,14 @@ LLSettingsWater::LLSettingsWater(const LLSD &data) : LLSettingsBase(data), mNextNormalMapID() { + loadValuesFromLLSD(); } LLSettingsWater::LLSettingsWater() : LLSettingsBase(), mNextNormalMapID() { + replaceSettings(defaults()); } //========================================================================= @@ -229,6 +231,7 @@ LLSD LLSettingsWater::translateLegacySettings(LLSD legacy) void LLSettingsWater::blend(LLSettingsBase::ptr_t &end, F64 blendf) { + LL_PROFILE_ZONE_SCOPED_CATEGORY_ENVIRONMENT; LLSettingsWater::ptr_t other = PTR_NAMESPACE::static_pointer_cast<LLSettingsWater>(end); if (other) { |