diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index ca4d5e9105..908ce1a637 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -19816,7 +19816,6 @@ Change of this parameter will affect the layout of buttons in notification toast Value 3 - UseEnvironmentFromRegionAlways Comment @@ -19828,7 +19827,6 @@ Change of this parameter will affect the layout of buttons in notification toast Value 1 - FSInterpolateSky Comment @@ -19840,7 +19838,6 @@ Change of this parameter will affect the layout of buttons in notification toast Value 1 - FSInterpolateWater Comment @@ -19852,18 +19849,6 @@ Change of this parameter will affect the layout of buttons in notification toast Value 1 - - FSInterpolateParcelWL - - Comment - FSInterpolateParcelWL - Persist - 1 - Type - Boolean - Value - 1 - FSWindlightInterpolateTime Comment @@ -19875,7 +19860,6 @@ Change of this parameter will affect the layout of buttons in notification toast Value 3.0 - _NACL_MLFovValues Comment diff --git a/indra/newview/kcwlinterface.cpp b/indra/newview/kcwlinterface.cpp index efb6e50ade..c33fc8e452 100644 --- a/indra/newview/kcwlinterface.cpp +++ b/indra/newview/kcwlinterface.cpp @@ -196,7 +196,8 @@ void KCWindlightInterface::applySettings(const LLSD& settings) if (settings.has("water") && (!mHaveRegionSettings || mHasRegionOverride)) { LL_INFOS() << "Applying WL water set: " << settings["water"].asString() << LL_ENDL; - LLEnvManagerNew::instance().setUseWaterPreset(settings["water"].asString(), gSavedSettings.getBOOL("FSInterpolateParcelWL")); + LLWLParamManager::getInstance()->mAnimator.stopInterpolation(); + LLEnvManagerNew::instance().setUseWaterPreset(settings["water"].asString()); setWL_Status(true); } else @@ -287,11 +288,12 @@ void KCWindlightInterface::applyWindlightPreset(const std::string& preset) return; } + LLWLParamManager::getInstance()->mAnimator.stopInterpolation(); LLWLParamManager* wlprammgr = LLWLParamManager::getInstance(); LLWLParamKey key(preset, LLEnvKey::SCOPE_LOCAL); if ( (preset != PARCEL_WL_DEFAULT) && (wlprammgr->hasParamSet(key)) ) { - LLEnvManagerNew::instance().setUseSkyPreset(preset, gSavedSettings.getBOOL("FSInterpolateParcelWL")); + LLEnvManagerNew::instance().setUseSkyPreset(preset); setWL_Status(true); mWeChangedIt = true; } @@ -299,7 +301,7 @@ void KCWindlightInterface::applyWindlightPreset(const std::string& preset) { if (!LLEnvManagerNew::instance().getUseRegionSettings()) { - LLEnvManagerNew::instance().setUseRegionSettings(true, gSavedSettings.getBOOL("FSInterpolateParcelWL")); + LLEnvManagerNew::instance().setUseRegionSettings(true); } setWL_Status(false); mWeChangedIt = false; diff --git a/indra/newview/llenvmanager.cpp b/indra/newview/llenvmanager.cpp index c9af2c1997..b423f36eb8 100644 --- a/indra/newview/llenvmanager.cpp +++ b/indra/newview/llenvmanager.cpp @@ -513,6 +513,7 @@ void LLEnvManagerNew::onRegionSettingsResponse(const LLSD& content) // [/RLVa:KB] { LL_DEBUGS("Windlight") << "Updating WL managers from prefs" << LL_ENDL; + LLWLParamManager::getInstance()->mAnimator.stopInterpolation(); updateManagersFromPrefs(mInterpNextChangeMessage); } //bit of a hacky override since I've repurposed many of the settings and methods here -KC @@ -522,6 +523,7 @@ void LLEnvManagerNew::onRegionSettingsResponse(const LLSD& content) { // reset all environmental settings to track the region defaults, make this reset 'sticky' like the other sun settings. LL_DEBUGS("Windlight") << "Resetting user prefs" << LL_ENDL; + LLWLParamManager::getInstance()->mAnimator.stopInterpolation(); setUserPrefs(getWaterPresetName(), getSkyPresetName(), getDayCycleName(), false, true, mInterpNextChangeMessage); } } diff --git a/indra/newview/skins/default/xui/de/panel_preferences_firestorm.xml b/indra/newview/skins/default/xui/de/panel_preferences_firestorm.xml index ecab9317ba..dbc65ec47c 100644 --- a/indra/newview/skins/default/xui/de/panel_preferences_firestorm.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_firestorm.xml @@ -134,7 +134,6 @@ - Interpolationsdauer (Sekunden): diff --git a/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml b/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml index 5733990787..a0dfa1feb0 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml @@ -900,16 +900,6 @@ height="16" name="FSWLWhitelistAll" width="256" /> - - Duración de la transición (en segundos): diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_firestorm.xml b/indra/newview/skins/default/xui/fr/panel_preferences_firestorm.xml index e9239254c3..9885278b54 100644 --- a/indra/newview/skins/default/xui/fr/panel_preferences_firestorm.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_firestorm.xml @@ -81,7 +81,6 @@ - Durée des transitions (secondes) : Texture des nuages (Redémarrage requis) : diff --git a/indra/newview/skins/default/xui/it/panel_preferences_firestorm.xml b/indra/newview/skins/default/xui/it/panel_preferences_firestorm.xml index b1c989fb3c..74d8cd3f0b 100644 --- a/indra/newview/skins/default/xui/it/panel_preferences_firestorm.xml +++ b/indra/newview/skins/default/xui/it/panel_preferences_firestorm.xml @@ -94,7 +94,6 @@ - diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_firestorm.xml b/indra/newview/skins/default/xui/ja/panel_preferences_firestorm.xml index cfd8fcd588..e2dea6c741 100644 --- a/indra/newview/skins/default/xui/ja/panel_preferences_firestorm.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_firestorm.xml @@ -163,7 +163,6 @@ - クロスフェードする時間 (秒): diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_firestorm.xml b/indra/newview/skins/default/xui/pl/panel_preferences_firestorm.xml index dd55abd4cd..cd392650ae 100644 --- a/indra/newview/skins/default/xui/pl/panel_preferences_firestorm.xml +++ b/indra/newview/skins/default/xui/pl/panel_preferences_firestorm.xml @@ -118,7 +118,6 @@ - Czas przenikania (w sekundach): diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_firestorm.xml b/indra/newview/skins/default/xui/ru/panel_preferences_firestorm.xml index 53590f45f0..7cf12a9b3c 100644 --- a/indra/newview/skins/default/xui/ru/panel_preferences_firestorm.xml +++ b/indra/newview/skins/default/xui/ru/panel_preferences_firestorm.xml @@ -117,7 +117,6 @@ - Продолжительность перехода: