From 258fe8bad0542b757bae1465d4dde598611d95a8 Mon Sep 17 00:00:00 2001 From: Latif Khalifa Date: Tue, 14 Aug 2012 21:30:25 +0200 Subject: [PATCH] Fixed region windlight on OpenSim. It's not possible to assume that the mere existance of M7WL should mean override of RegionWindlight as M7WL is always sent. If M7WL is to have a preference some other method must be devised, ie. a debug setting --- indra/newview/llenvmanager.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/indra/newview/llenvmanager.cpp b/indra/newview/llenvmanager.cpp index 7e5377bd1..f3ffe732f 100644 --- a/indra/newview/llenvmanager.cpp +++ b/indra/newview/llenvmanager.cpp @@ -494,13 +494,11 @@ void LLEnvManagerNew::onRegionSettingsResponse(const LLSD& content) // Load region sky presets. LLWLParamManager::instance().refreshRegionPresets(); - bool bOverridden = M7WindlightInterface::getInstance()->hasOverride(); + // Not possible to assume M7WL should take precidence as OpenSim will send both + // bool bOverridden = M7WindlightInterface::getInstance()->hasOverride(); // If using server settings, update managers. -// if (getUseRegionSettings()) -// [RLVa:KB] - Checked: 2011-08-29 (RLVa-1.4.1a) | Added: RLVa-1.4.1a - if (!bOverridden && (getUseRegionSettings()) && (LLWLParamManager::getInstance()->mAnimator.getIsRunning()) ) -// [/RLVa:KB] + if (getUseRegionSettings()) { updateManagersFromPrefs(mInterpNextChangeMessage); }