diff options
Diffstat (limited to 'indra/llinventory')
| -rw-r--r-- | indra/llinventory/llsettingsbase.cpp | 2 | ||||
| -rw-r--r-- | indra/llinventory/llsettingsdaycycle.h | 10 | ||||
| -rw-r--r-- | indra/llinventory/llsettingssky.h | 12 | ||||
| -rw-r--r-- | indra/llinventory/llsettingswater.h | 4 |
4 files changed, 14 insertions, 14 deletions
diff --git a/indra/llinventory/llsettingsbase.cpp b/indra/llinventory/llsettingsbase.cpp index 7cedffa507..abe1a1a04a 100644 --- a/indra/llinventory/llsettingsbase.cpp +++ b/indra/llinventory/llsettingsbase.cpp @@ -39,7 +39,7 @@ namespace } //========================================================================= -std::ostream &::operator <<(std::ostream& os, LLSettingsBase &settings) +std::ostream &operator <<(std::ostream& os, LLSettingsBase &settings) { LLSDSerialize::serialize(settings.getSettings(), os, LLSDSerialize::LLSD_NOTATION); diff --git a/indra/llinventory/llsettingsdaycycle.h b/indra/llinventory/llsettingsdaycycle.h index 7703f7a0b4..2d0fa4a840 100644 --- a/indra/llinventory/llsettingsdaycycle.h +++ b/indra/llinventory/llsettingsdaycycle.h @@ -71,15 +71,15 @@ public: bool initialize(); virtual ptr_t buildClone() = 0; - virtual LLSD getSettings() const; + virtual LLSD getSettings() const override; virtual LLSettingsType getSettingTypeValue() const override { return LLSettingsType::ST_DAYCYCLE; } //--------------------------------------------------------------------- - virtual std::string getSettingType() const { return std::string("daycycle"); } + virtual std::string getSettingType() const override { return std::string("daycycle"); } // Settings status - virtual void blend(const LLSettingsBase::ptr_t &other, F64 mix); + virtual void blend(const LLSettingsBase::ptr_t &other, F64 mix) override; static LLSD defaults(); @@ -104,13 +104,13 @@ public: void setInitialized(bool value = true) { mInitialized = value; } CycleTrack_t & getCycleTrack(S32 track); - virtual validation_list_t getValidationList() const; + virtual validation_list_t getValidationList() const override; static validation_list_t validationList(); protected: LLSettingsDay(); - virtual void updateSettings(); + virtual void updateSettings() override; bool mInitialized; diff --git a/indra/llinventory/llsettingssky.h b/indra/llinventory/llsettingssky.h index 5d7d3adbfe..df6a310647 100644 --- a/indra/llinventory/llsettingssky.h +++ b/indra/llinventory/llsettingssky.h @@ -52,6 +52,8 @@ public: static const std::string SETTING_CLOUD_SCROLL_RATE; static const std::string SETTING_CLOUD_SHADOW; static const std::string SETTING_CLOUD_TEXTUREID; + static const std::string SETTING_DENSITY_MULTIPLIER; + static const std::string SETTING_DISTANCE_MULTIPLIER; static const std::string SETTING_DOME_OFFSET; static const std::string SETTING_DOME_RADIUS; static const std::string SETTING_GAMMA; @@ -97,7 +99,7 @@ public: // Settings status - virtual void blend(const LLSettingsBase::ptr_t &end, F64 blendf); + virtual void blend(const LLSettingsBase::ptr_t &end, F64 blendf) override; static LLSD defaults(); @@ -439,13 +441,11 @@ public: return mTotalAmbient; } - virtual validation_list_t getValidationList() const; + virtual validation_list_t getValidationList() const override; static validation_list_t validationList(); static LLSD translateLegacySettings(LLSD legacy); - static LLSD settingValidation(LLSD &settings, validation_list_t &validations); - protected: static const std::string SETTING_LEGACY_EAST_ANGLE; static const std::string SETTING_LEGACY_ENABLE_CLOUD_SCROLL; @@ -453,9 +453,9 @@ protected: LLSettingsSky(); - virtual stringset_t getSlerpKeys() const; + virtual stringset_t getSlerpKeys() const override; - virtual void updateSettings(); + virtual void updateSettings() override; private: // validations for structured sections of sky settings data diff --git a/indra/llinventory/llsettingswater.h b/indra/llinventory/llsettingswater.h index 16d5b2353a..d4152acfa1 100644 --- a/indra/llinventory/llsettingswater.h +++ b/indra/llinventory/llsettingswater.h @@ -61,7 +61,7 @@ public: virtual LLSettingsType getSettingTypeValue() const override { return LLSettingsType::ST_WATER; } // Settings status - virtual void blend(const LLSettingsBase::ptr_t &end, F64 blendf); + virtual void blend(const LLSettingsBase::ptr_t &end, F64 blendf) override; static LLSD defaults(); @@ -199,7 +199,7 @@ public: return mWaterFogKS; } - virtual validation_list_t getValidationList() const; + virtual validation_list_t getValidationList() const override; static validation_list_t validationList(); static LLSD translateLegacySettings(LLSD legacy); |