diff options
| -rw-r--r-- | indra/llinventory/llsettingsbase.h | 2 | ||||
| -rw-r--r-- | indra/llinventory/llsettingssky.cpp | 7 | ||||
| -rw-r--r-- | indra/llinventory/llsettingssky.h | 4 | ||||
| -rw-r--r-- | indra/llrender/llshadermgr.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llenvironment.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llsettingsvo.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llviewershadermgr.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llvosky.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/pipeline.cpp | 2 |
9 files changed, 7 insertions, 18 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; diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index aa54a5f040..544a4f00aa 100644 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -35,8 +35,6 @@ #include "OpenGL/OpenGL.h" #endif -#pragma optimize("", off) - #ifdef LL_RELEASE_FOR_DOWNLOAD #define UNIFORM_ERRS LL_WARNS_ONCE("Shader") #else diff --git a/indra/newview/llenvironment.cpp b/indra/newview/llenvironment.cpp index e9c27a7794..2650f69a2f 100644 --- a/indra/newview/llenvironment.cpp +++ b/indra/newview/llenvironment.cpp @@ -58,8 +58,6 @@ #include "llatmosphere.h" -#pragma optimize("", off) - //define EXPORT_PRESETS 1 //========================================================================= namespace diff --git a/indra/newview/llsettingsvo.cpp b/indra/newview/llsettingsvo.cpp index d5bcbd1894..451a0fb326 100644 --- a/indra/newview/llsettingsvo.cpp +++ b/indra/newview/llsettingsvo.cpp @@ -58,8 +58,6 @@ #include "llassetstorage.h" #include "llvfile.h" -#pragma optimize("", off) - #undef VERIFY_LEGACY_CONVERSION //========================================================================= diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp index 6837c6a815..820e18290f 100644 --- a/indra/newview/llviewershadermgr.cpp +++ b/indra/newview/llviewershadermgr.cpp @@ -46,8 +46,6 @@ #include "llenvironment.h" #include "llatmosphere.h" -#pragma optimize("", off) - #ifdef LL_RELEASE_FOR_DOWNLOAD #define UNIFORM_ERRS LL_WARNS_ONCE("Shader") #else diff --git a/indra/newview/llvosky.cpp b/indra/newview/llvosky.cpp index a2ea3181ca..fc83218b1a 100644 --- a/indra/newview/llvosky.cpp +++ b/indra/newview/llvosky.cpp @@ -53,8 +53,6 @@ #include "llsettingssky.h" #include "llenvironment.h" -#pragma optimize("", off) - #undef min #undef max diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index e80b5cc9ef..27db6778eb 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -116,8 +116,6 @@ #include "llenvironment.h" -#pragma optimize("", off) - #ifdef _DEBUG // Debug indices is disabled for now for debug performance - djs 4/24/02 //#define DEBUG_INDICES |