diff options
| author | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-02-28 22:34:43 +0000 |
|---|---|---|
| committer | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-02-28 22:34:43 +0000 |
| commit | 73caf6f52d672a6c11c00326b6befefd145dff1d (patch) | |
| tree | a606bbad292cee5884ead897190830e9291c3c97 /indra/llinventory | |
| parent | ccdf55f4abdbe4ef0944f8c28216d78e259e3cf0 (diff) | |
Fix accidental dups/deletes from merge and remove optimize pragmas.
Diffstat (limited to 'indra/llinventory')
| -rw-r--r-- | indra/llinventory/llsettingssky.cpp | 4 | ||||
| -rw-r--r-- | indra/llinventory/llsettingssky.h | 11 |
2 files changed, 2 insertions, 13 deletions
diff --git a/indra/llinventory/llsettingssky.cpp b/indra/llinventory/llsettingssky.cpp index c2d92fdd38..f1124dce4b 100644 --- a/indra/llinventory/llsettingssky.cpp +++ b/indra/llinventory/llsettingssky.cpp @@ -443,8 +443,6 @@ LLSD LLSettingsSky::defaults() return dfltsetting; } -#pragma optimize("", off) - LLSD LLSettingsSky::settingValidation(LLSD &settingsIn, validation_list_t &validations) { // Make a copy we can safely modify @@ -576,8 +574,6 @@ LLSD LLSettingsSky::settingValidation(LLSD &settingsIn, validation_list_t &valid return LLSDMap("success", LLSD::Boolean(false)); } -#pragma optimize("", on) - LLSD LLSettingsSky::translateLegacySettings(LLSD legacy) { LLSD newsettings(defaults()); diff --git a/indra/llinventory/llsettingssky.h b/indra/llinventory/llsettingssky.h index df6a310647..87b1f95af6 100644 --- a/indra/llinventory/llsettingssky.h +++ b/indra/llinventory/llsettingssky.h @@ -44,7 +44,6 @@ public: static const std::string SETTING_DISTANCE_MULTIPLIER; static const std::string SETTING_HAZE_DENSITY; static const std::string SETTING_HAZE_HORIZON; - static const std::string SETTING_BLOOM_TEXTUREID; static const std::string SETTING_CLOUD_COLOR; static const std::string SETTING_CLOUD_POS_DENSITY1; static const std::string SETTING_CLOUD_POS_DENSITY2; @@ -52,8 +51,6 @@ 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; @@ -120,11 +117,6 @@ public: setValue(SETTING_AMBIENT, val); } - LLUUID getBloomTextureId() const - { - return mSettings[SETTING_BLOOM_TEXTUREID].asUUID(); - } - LLColor3 getBlueDensity() const { return LLColor3(mSettings[SETTING_BLUE_DENSITY]); @@ -444,7 +436,8 @@ public: virtual validation_list_t getValidationList() const override; static validation_list_t validationList(); - static LLSD translateLegacySettings(LLSD legacy); + static LLSD translateLegacySettings(LLSD legacy); + static LLSD settingValidation(LLSD &settingsIn, validation_list_t &validations); protected: static const std::string SETTING_LEGACY_EAST_ANGLE; |