Fix mis-merge of LLSettingsBase and remove optimize pragmas.

3 files changed, 7 insertions, 6 deletions

diff --git a/indra/llinventory/llsettingsbase.h b/indra/llinventory/llsettingsbase.h
index 29ed50419a..0b99166a86 100644
--- a/indra/llinventory/llsettingsbase.h
+++ b/indra/llinventory/llsettingsbase.h
@@ -166,6 +166,8 @@ public:
 
     virtual bool    validate();
 
+    virtual ptr_t   buildDerivedClone() = 0;
+
     class Validator
     {
     public:
diff --git a/indra/llinventory/llsettingssky.cpp b/indra/llinventory/llsettingssky.cpp
index b8623c3ed3..6c5ed8f12b 100644
--- a/indra/llinventory/llsettingssky.cpp
+++ b/indra/llinventory/llsettingssky.cpp
@@ -32,17 +32,14 @@
 #include "llfasttimer.h"
 #include "v3colorutil.h"
 
-#pragma optimize("", off)
-
 static const F32 NIGHTTIME_ELEVATION     = -8.0f; // degrees
 static const F32 NIGHTTIME_ELEVATION_SIN = (F32)sinf(NIGHTTIME_ELEVATION * DEG_TO_RAD);
-
+static const LLVector3 DUE_EAST = LLVector3::x_axis;
 //=========================================================================
 namespace
 {
     LLTrace::BlockTimerStatHandle FTM_BLEND_SKYVALUES("Blending Sky Environment");
-    LLTrace::BlockTimerStatHandle FTM_UPDATE_SKYVALUES("Update Sky Environment");
-    static const LLVector3 DUE_EAST = LLVector3::x_axis;
+    LLTrace::BlockTimerStatHandle FTM_UPDATE_SKYVALUES("Update Sky Environment");    
 }
 
 static LLQuaternion convert_azimuth_and_altitude_to_quat(F32 azimuth, F32 altitude)
diff --git a/indra/llinventory/llsettingssky.h b/indra/llinventory/llsettingssky.h
index 9b50f5a4b6..ee201f4122 100644
--- a/indra/llinventory/llsettingssky.h
+++ b/indra/llinventory/llsettingssky.h
@@ -376,13 +376,15 @@ public:
     static validation_list_t validationList();
 
     static LLSD translateLegacySettings(const LLSD& legacy);
+
+// LEGACY_ATMOSPHERICS
     static LLSD translateLegacyHazeSettings(const LLSD& legacy);
 
     LLColor3 getLightAttenuation(F32 distance) const;
     LLColor3 getLightTransmittance() const;
     LLColor3 gammaCorrect(const LLColor3& in) const;
 
-// LEGACY_ATMOSPHERICS
+
     LLColor3 getBlueDensity() const;
     LLColor3 getBlueHorizon() const;
     F32 getHazeDensity() const;