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.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/llinventory/llsettingssky.h b/indra/llinventory/llsettingssky.h
index 4884f4f094..d08e2bbd03 100644
--- a/indra/llinventory/llsettingssky.h
+++ b/indra/llinventory/llsettingssky.h
@@ -90,7 +90,7 @@ public:
//---------------------------------------------------------------------
virtual std::string getSettingType() const override { return std::string("sky"); }
- virtual LLSettingsType getSettingTypeValue() const override { return LLSettingsType::ST_SKY; }
+ virtual LLSettingsType::type_e getSettingTypeValue() const override { return LLSettingsType::ST_SKY; }
// Settings status
@@ -104,7 +104,6 @@ public:
}
//---------------------------------------------------------------------
-// LEGACY_ATMOSPHERICS
LLColor3 getAmbientColor() const
{
return LLColor3(mSettings[SETTING_AMBIENT]);
@@ -433,7 +432,7 @@ public:
virtual validation_list_t getValidationList() const override;
static validation_list_t validationList();
- static LLSD translateLegacySettings(LLSD legacy);
+ static LLSD translateLegacySettings(LLSD legacy);
protected:
static const std::string SETTING_LEGACY_EAST_ANGLE;