diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-09-04 23:53:05 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-09-04 23:53:05 +0100 |
| commit | 59a36c2037b6ee87c656d5b314745d3bf82ede1a (patch) | |
| tree | c0ccfb19433e4206deacc83b01f1f849b7595137 | |
| parent | a65afc30a968c752f1e252258e6917554a78f56a (diff) | |
| parent | 4aaa23fe6d4a875998a7472e656e058a1581513a (diff) | |
Merge
| -rw-r--r-- | indra/llinventory/llsettingssky.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llviewershadermgr.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llvosky.cpp | 22 |
3 files changed, 4 insertions, 22 deletions
diff --git a/indra/llinventory/llsettingssky.cpp b/indra/llinventory/llsettingssky.cpp index 3b2e7de27d..ba92a82174 100644 --- a/indra/llinventory/llsettingssky.cpp +++ b/indra/llinventory/llsettingssky.cpp @@ -534,7 +534,7 @@ LLSettingsSky::validation_list_t LLSettingsSky::validationList() boost::bind(&Validator::verifyFloatRange, _1, LLSD(LLSDArray(0.25f)(20.0f))), LLSD::Real(1.0))); validation.push_back(Validator(SETTING_MOON_TEXTUREID, false, LLSD::TypeUUID)); validation.push_back(Validator(SETTING_STAR_BRIGHTNESS, true, LLSD::TypeReal, - boost::bind(&Validator::verifyFloatRange, _1, LLSD(LLSDArray(0.0f)(2.0f))))); + boost::bind(&Validator::verifyFloatRange, _1, LLSD(LLSDArray(0.0f)(512.0f))))); validation.push_back(Validator(SETTING_SUNLIGHT_COLOR, true, LLSD::TypeArray, boost::bind(&Validator::verifyVectorMinMax, _1, LLSD(LLSDArray(0.0f)(0.0f)(0.0f)("*")), diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp index 05c722a114..cd378c0a56 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 d3b1f1459f..b52b8f1587 100644 --- a/indra/newview/llvosky.cpp +++ b/indra/newview/llvosky.cpp @@ -59,8 +59,6 @@ #undef min #undef max -#pragma optimize("", off) - namespace { const S32 NUM_TILES_X = 8; @@ -644,23 +642,9 @@ bool LLVOSky::updateSky() bool light_direction_changed = (dot_lighting < LIGHT_DIRECTION_THRESHOLD); bool color_changed = (delta_color.length() >= COLOR_CHANGE_THRESHOLD); - if (light_direction_changed) - { - mForceUpdate = true; - } - - if (color_changed) - { - mForceUpdate = true; - } - - if (!mInitialized) - { - mForceUpdate = true; - } - //mForceUpdate = mForceUpdate || light_direction_changed; - //mForceUpdate = mForceUpdate || color_changed; - //mForceUpdate = mForceUpdate || !mInitialized; + mForceUpdate = mForceUpdate || light_direction_changed; + mForceUpdate = mForceUpdate || color_changed; + mForceUpdate = mForceUpdate || !mInitialized; if (mForceUpdate && mForceUpdateThrottle.hasExpired()) { |