diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-03-06 09:36:23 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-03-06 09:36:23 +0800 |
| commit | d13a43c74f9c7e450f87edab0bcd9db39ee7c56e (patch) | |
| tree | d40e4e3c1f5ce0cf80b11b2d03568c48cfc5e88f /indra/llinventory/llsettingsbase.h | |
| parent | 5bf93b728ca7c671b6b812e753a40dcdb55b5d0d (diff) | |
| parent | aa060ae56c62869bb1d0f590e9a6eb681aabcefc (diff) | |
Merge remote-tracking branch 'secondlife/release/2025.03' into 2025.03
Diffstat (limited to 'indra/llinventory/llsettingsbase.h')
| -rw-r--r-- | indra/llinventory/llsettingsbase.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/llinventory/llsettingsbase.h b/indra/llinventory/llsettingsbase.h index 816ff3e111..7de71588ef 100644 --- a/indra/llinventory/llsettingsbase.h +++ b/indra/llinventory/llsettingsbase.h @@ -348,13 +348,8 @@ protected: LLSettingsBase(); LLSettingsBase(const LLSD setting); - static LLSD settingValidation(LLSD settings); - typedef std::set<std::string> stringset_t; - // combining settings objects. Customize for specific setting types - virtual void lerpSettings(LLSettingsBase &other, BlendFactor mix); - // combining settings maps where it can based on mix rate // @settings initial value (mix==0) // @other target value (mix==1) |