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

Parcel WL crossfading option is totally broken and crossfades into everything but the correct WL. And since the whole WL code in the viewer is a huge pile of mess, rather dump the option than regularly show the wrong WL

meow-7.2.2
Ansariel 2016-10-10 12:15:16 +02:00
parent 1866988c08
commit 9800acf862
11 changed files with 7 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
indra/newview/app_settings/settings.xml
View File

@ -19816,7 +19816,6 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Value</key>
<integer>3</integer>
</map>
<key>UseEnvironmentFromRegionAlways</key>
<map>
<key>Comment</key>
@ -19828,7 +19827,6 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Value</key>
<integer>1</integer>
</map>
<key>FSInterpolateSky</key>
<map>
<key>Comment</key>
@ -19840,7 +19838,6 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Value</key>
<integer>1</integer>
</map>
<key>FSInterpolateWater</key>
<map>
<key>Comment</key>
@ -19852,18 +19849,6 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Value</key>
<integer>1</integer>
</map>
<key>FSInterpolateParcelWL</key>
<map>
<key>Comment</key>
<string>FSInterpolateParcelWL</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>FSWindlightInterpolateTime</key>
<map>
<key>Comment</key>
@ -19875,7 +19860,6 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Value</key>
<real>3.0</real>
</map>
<key>_NACL_MLFovValues</key>
<map>
<key>Comment</key>

8
indra/newview/kcwlinterface.cpp
View File

@ -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;

2
indra/newview/llenvmanager.cpp
View File

@ -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);
}
}

1
indra/newview/skins/default/xui/de/panel_preferences_firestorm.xml
View File

@ -134,7 +134,6 @@
<check_box label="WL-Einstellungen von Freunden automatisch übernehmen" name="FSWLWhitelistFriends"/>
<check_box label="WL-Einstellungen von Land im Besitz meiner Gruppen automatisch übernehmen" name="FSWLWhitelistGroups"/>
<check_box label="WL-Einstellungen von allen Parzellen automatisch übernehmen" name="FSWLWhitelistAll"/>
<check_box label="Wechsel der Umgebungseinstellungen interpolieren" name="FSInterpolateParcelWL" tool_tip="Aktiviert einen Überblendeffekt bei Änderungen an den Umgebungseinstellungen beim Windlight-Sharing für Parzellen."/>
<text name="wl_crossfade_label">
Interpolationsdauer (Sekunden):
</text>

10
indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
View File

@ -900,16 +900,6 @@
height="16"
name="FSWLWhitelistAll"
width="256" />
<check_box
top_pad="5"
label="Crossfade region environment changes for Parcel WL"
control_name="FSInterpolateParcelWL"
enabled_control="FSWLParcelEnabled"
follows="left|top"
height="16"
name="FSInterpolateParcelWL"
width="256"
tool_tip="Same as above options for Interpolation but for the ParcelWL." />
<text
top_pad="10"

1
indra/newview/skins/default/xui/es/panel_preferences_firestorm.xml
View File

@ -96,7 +96,6 @@
<check_box label="Autoaplicar las configuraciones WL de los terrenos de mis amigos" name="FSWLWhitelistFriends"/>
<check_box label="Autoaplicar las configuraciones WL de los terrenos de mis grupos" name="FSWLWhitelistGroups"/>
<check_box label="Autoaplicar las configuraciones WL de cualquier parcela" name="FSWLWhitelistAll"/>
<check_box label="Interpolar los cambios de entorno de la región con el WL de la parcela" name="FSInterpolateParcelWL" tool_tip="Igual que las opciones anteriores sobre transiciones, pero para la configuración WL de la parcela"/>
<text name="wl_crossfade_label" width="230">
Duración de la transición (en segundos):
</text>

1
indra/newview/skins/default/xui/fr/panel_preferences_firestorm.xml
View File

@ -81,7 +81,6 @@
<check_box label="Appliquer automatiquement les paramètres WL des terrains de mes amis" name="FSWLWhitelistFriends"/>
<check_box label="Appliquer automatiquement les paramètres WL des terrains de de mes groupes" name="FSWLWhitelistGroups"/>
<check_box label="Appliquer automatiquement les paramètres WL de tous les terrains" name="FSWLWhitelistAll"/>
<check_box label="Transition des WL lors d'un changement de région &amp; de terrain" name="FSInterpolateParcelWL" tool_tip="Comme ci-desssus, mais pour les paramètres environnementaux du terrain."/>
<text name="wl_crossfade_label" width="245">Durée des transitions (secondes) :</text>
<spinner name="FSWindlightInterpolateTime" tool_tip="La durée en secondes d'une transition entre deux préréglages (3 par défaut)"/>
<text name="could_texture_text" width="240">Texture des nuages (Redémarrage requis) :</text>

1
indra/newview/skins/default/xui/it/panel_preferences_firestorm.xml
View File

@ -94,7 +94,6 @@
<check_box label="Applica automaticamente le impostazioni WL nelle sim di amici" name="FSWLWhitelistFriends" />
<check_box label="Applica automaticamente le impostazioni WL nelle land dei miei Gruppi" name="FSWLWhitelistGroups" />
<check_box label="Applica automaticamente le impostazioni WL ovunque" name="FSWLWhitelistAll" />
<check_box label="Cambiare gradualmente le impostazioni al cambio sim del WL" name="FSInterpolateParcelWL" tool_tip="Questa opzione cambierà le impostazioni dell'ambiente gradualmente, questo provocherà rallentamenti poichè richiede un'utilizzo di FPS. Disabilitarla per cambiare instantaniamente le impostazioni dell'ambiente" />
</panel>
<!--Costruzione-->
<panel label="Costr. 1" name="BuildTab">

1
indra/newview/skins/default/xui/ja/panel_preferences_firestorm.xml
View File

@ -163,7 +163,6 @@
<check_box label="フレンドの土地のWindlight設定を自動的に適用する" name="FSWLWhitelistFriends"/>
<check_box label="グループの土地のWindlight設定を自動的に適用する" name="FSWLWhitelistGroups" />
<check_box label="どんな土地区画のWindlight設定も自動的に適用する" name="FSWLWhitelistAll" />
<check_box label="土地区画に設定された環境設定に現在の設定から徐々に変化させる" name="FSInterpolateParcelWL" tool_tip="上にある地域／不動産の場合と同じ効果ですが、こちらは土地区画に設定されたWindlightに対する効果となります。" />
<text name="wl_crossfade_label">
クロスフェードする時間 (秒):
</text>

1
indra/newview/skins/default/xui/pl/panel_preferences_firestorm.xml
View File

@ -118,7 +118,6 @@
<check_box label="Automatycznie stosuj ustawienia WL na działkach znajomych" name="FSWLWhitelistFriends" />
<check_box label="Automatycznie stosuj ustawienia WL na działkach moich grup" name="FSWLWhitelistGroups" />
<check_box label="Automatycznie stosuj ustawienia WL na wszystkich działkach" name="FSWLWhitelistAll" />
<check_box label="Automatycznie zmieniaj środowisko dla WL działek" name="FSInterpolateParcelWL" tool_tip="To samo, co dla opcji przenikania powyżej, ale dla WL działek." />
<text name="wl_crossfade_label">
Czas przenikania (w sekundach):
</text>

1
indra/newview/skins/default/xui/ru/panel_preferences_firestorm.xml
View File

@ -117,7 +117,6 @@
<check_box label="Автоматически применять настройки окружающей среды от друзей" name="FSWLWhitelistFriends" />
<check_box label="Автоматически применять настройки окружающей среды от групп" name="FSWLWhitelistGroups" />
<check_box label="Автоматически применять настройки окружающей среды от любого участка" name="FSWLWhitelistAll" />
<check_box label="Плавный переход из ОС региона в ОС участка" name="FSInterpolateParcelWL" tool_tip="Плавный переход из ОС региона в ОС участка" />
<text name="wl_crossfade_label">
Продолжительность перехода:
</text>