From 73caf6f52d672a6c11c00326b6befefd145dff1d Mon Sep 17 00:00:00 2001 From: "Graham Linden graham@lindenlab.com" Date: Wed, 28 Feb 2018 22:34:43 +0000 Subject: Fix accidental dups/deletes from merge and remove optimize pragmas. --- indra/llinventory/llsettingssky.cpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'indra/llinventory/llsettingssky.cpp') 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()); -- cgit v1.3