summaryrefslogtreecommitdiff
path: root/indra/llinventory/llsettingssky.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/llinventory/llsettingssky.h')
-rw-r--r--indra/llinventory/llsettingssky.h12
1 files changed, 6 insertions, 6 deletions
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