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

FIRE-6563: Use region water WL settings if no parcel WL water settings have been defined

meow-7.2.2
Ansariel 2016-10-10 10:04:52 +02:00
parent 44cee1f695
commit 5e451e7131
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/kcwlinterface.cpp
View File

@ -199,6 +199,12 @@ void KCWindlightInterface::applySettings(const LLSD& settings)
LLEnvManagerNew::instance().setUseWaterPreset(settings["water"].asString(), gSavedSettings.getBOOL("FSInterpolateParcelWL"));
setWL_Status(true);
}
else
{
LL_INFOS() << "Applying region default WL water set" << LL_ENDL;
LLWLParamManager::getInstance()->mAnimator.stopInterpolation(); // Not nice to not interpolate, but these 2836724 methods of changing a WL setting will nicely screw up each other
LLEnvManagerNew::instance().useRegionWater();
}
}
else
{

2
indra/newview/llenvmanager.cpp
View File

@ -703,7 +703,7 @@ bool LLEnvManagerNew::useRegionWater()
FloaterQuickPrefs::updateParam(QP_PARAM_WATER, LLSD(PRESET_NAME_REGION_DEFAULT));
// Otherwise apply region water.
LL_DEBUGS("Windlight") << "Applying region sky" << LL_ENDL;
LL_DEBUGS("Windlight") << "Applying region water" << LL_ENDL;
return useWaterParams(region_water);
}