livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge

meow-7.2.2
Graham Linden 2018-09-04 23:53:05 +01:00
parent a65afc30a9 4aaa23fe6d
commit 59a36c2037
3 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llinventory/llsettingssky.cpp
View File

@ -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)("*")),

2
indra/newview/llviewershadermgr.cpp
View File

@ -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

22
indra/newview/llvosky.cpp
View File

@ -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())
{