From 5e451e7131531d862cb1220384dfedbf960ae201 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Mon, 10 Oct 2016 10:04:52 +0200 Subject: [PATCH] FIRE-6563: Use region water WL settings if no parcel WL water settings have been defined --- indra/newview/kcwlinterface.cpp | 6 ++++++ indra/newview/llenvmanager.cpp | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/indra/newview/kcwlinterface.cpp b/indra/newview/kcwlinterface.cpp index 706dd0f61d..3b8689a53e 100644 --- a/indra/newview/kcwlinterface.cpp +++ b/indra/newview/kcwlinterface.cpp @@ -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 { diff --git a/indra/newview/llenvmanager.cpp b/indra/newview/llenvmanager.cpp index c8f63bf498..c9af2c1997 100644 --- a/indra/newview/llenvmanager.cpp +++ b/indra/newview/llenvmanager.cpp @@ -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); }