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/llsettingssky.cpp | |
| parent | ccdf55f4abdbe4ef0944f8c28216d78e259e3cf0 (diff) | |
Fix accidental dups/deletes from merge and remove optimize pragmas.
Diffstat (limited to 'indra/llinventory/llsettingssky.cpp')
| -rw-r--r-- | indra/llinventory/llsettingssky.cpp | 4 |
1 files changed, 0 insertions, 4 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()); |