From 6006df3f62b91ccf9487f4efe1bab47d34e89753 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Thu, 29 Sep 2016 21:15:52 +0200 Subject: [PATCH] FIRE-19972: Parcel WL might be overridden by region environment settings if region caps and region environment settings arrive after parcel properties --- indra/newview/llenvmanager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/llenvmanager.cpp b/indra/newview/llenvmanager.cpp index ed9c6d076d..2d05dd1973 100644 --- a/indra/newview/llenvmanager.cpp +++ b/indra/newview/llenvmanager.cpp @@ -504,7 +504,7 @@ void LLEnvManagerNew::onRegionSettingsResponse(const LLSD& content) LLWLParamManager::instance().refreshRegionPresets(); // Use the region settings if parcel settings didnt override it already - if (KCWindlightInterface::instance().haveParcelOverride(new_settings)) + if (!KCWindlightInterface::instance().haveParcelOverride(new_settings)) { // If using server settings, update managers. // if (getUseRegionSettings())