From f42ac5b94e384c789de0b2c4e865b087589a940e Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Tue, 22 Jan 2019 09:24:11 -0800 Subject: SL-10387: Move settings intjection to a setting object (and out of llEnvironment) --- indra/llinventory/llsettingsbase.h | 5 ++--- indra/llinventory/llsettingssky.cpp | 2 +- indra/llinventory/llsettingssky.h | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) (limited to 'indra/llinventory') diff --git a/indra/llinventory/llsettingsbase.h b/indra/llinventory/llsettingsbase.h index 87466e6570..9e03052892 100644 --- a/indra/llinventory/llsettingsbase.h +++ b/indra/llinventory/llsettingsbase.h @@ -317,6 +317,8 @@ public: mSettings.erase(SETTING_ASSETID); } + // Calculate any custom settings that may need to be cached. + virtual void updateSettings() { mDirty = false; mReplaced = false; } protected: LLSettingsBase(); @@ -347,9 +349,6 @@ protected: // rather than lerped. virtual stringset_t getSlerpKeys() const { return stringset_t(); } - // Calculate any custom settings that may need to be cached. - virtual void updateSettings() { mDirty = false; mReplaced = false; } - virtual validation_list_t getValidationList() const = 0; // Apply any settings that need special handling. diff --git a/indra/llinventory/llsettingssky.cpp b/indra/llinventory/llsettingssky.cpp index e8dcba516e..86c8393499 100644 --- a/indra/llinventory/llsettingssky.cpp +++ b/indra/llinventory/llsettingssky.cpp @@ -139,7 +139,7 @@ const std::string LLSettingsSky::SETTING_SKY_ICE_LEVEL("ice_level"); const LLUUID LLSettingsSky::DEFAULT_ASSET_ID("eb3a7080-831f-9f37-10f0-7b1f9ea4043c"); -static const LLUUID DEFAULT_SUN_ID("8ae0acc4-9e87-7f25-e16e-2a6caa5b8fc3"); // dataserver +static const LLUUID DEFAULT_SUN_ID("32bfbcea-24b1-fb9d-1ef9-48a28a63730f"); // dataserver static const LLUUID DEFAULT_MOON_ID("db13b827-7e6a-7ace-bed4-4419ee00984d"); // dataserver static const LLUUID DEFAULT_CLOUD_ID("1dc1368f-e8fe-f02d-a08d-9d9f11c1af6b"); diff --git a/indra/llinventory/llsettingssky.h b/indra/llinventory/llsettingssky.h index 4d0d4268b2..a09dcd2008 100644 --- a/indra/llinventory/llsettingssky.h +++ b/indra/llinventory/llsettingssky.h @@ -311,6 +311,7 @@ public: F32 constant_term, F32 aniso_factor = 0.0f); + virtual void updateSettings() SETTINGS_OVERRIDE; protected: static const std::string SETTING_LEGACY_EAST_ANGLE; static const std::string SETTING_LEGACY_ENABLE_CLOUD_SCROLL; @@ -320,7 +321,6 @@ protected: virtual stringset_t getSlerpKeys() const SETTINGS_OVERRIDE; virtual stringset_t getSkipInterpolateKeys() const SETTINGS_OVERRIDE; - virtual void updateSettings() SETTINGS_OVERRIDE; private: static LLSD rayleighConfigDefault(); -- cgit v1.2.3