diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index a884bbb3cf..fd8753eeda 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -1537,6 +1537,9 @@ void LLFloaterPreference::refreshEnabledState() (ctrl_wind_light->get()) ? TRUE : FALSE; ctrl_deferred->setEnabled(enabled); + + // Tofu's SSR + getChild("FSRenderSSR")->setEnabled(enabled && (ctrl_deferred->get() ? TRUE : FALSE) && gSavedSettings.getS32("RenderShadowDetail") > 0); LLCheckBoxCtrl* ctrl_ssao = getChild("UseSSAO"); LLCheckBoxCtrl* ctrl_dof = getChild("UseDoF"); @@ -1570,6 +1573,8 @@ void LLFloaterPreference::disableUnavailableSettings() LLComboBox* ctrl_shadows = getChild("ShadowDetail"); LLCheckBoxCtrl* ctrl_ssao = getChild("UseSSAO"); LLCheckBoxCtrl* ctrl_dof = getChild("UseDoF"); + // Tofu's SSR + LLCheckBoxCtrl* ctrl_ssr = getChild("FSRenderSSR"); // if vertex shaders off, disable all shader related products if (!LLFeatureManager::getInstance()->isFeatureAvailable("VertexShaderEnable")) @@ -1600,6 +1605,10 @@ void LLFloaterPreference::disableUnavailableSettings() ctrl_deferred->setEnabled(FALSE); ctrl_deferred->setValue(FALSE); + + // Tofu's SSR + ctrl_ssr->setEnabled(FALSE); + ctrl_ssr->setValue(FALSE); } // disabled windlight @@ -1620,6 +1629,10 @@ void LLFloaterPreference::disableUnavailableSettings() ctrl_deferred->setEnabled(FALSE); ctrl_deferred->setValue(FALSE); + + // Tofu's SSR + ctrl_ssr->setEnabled(FALSE); + ctrl_ssr->setValue(FALSE); } // disabled deferred @@ -1637,6 +1650,10 @@ void LLFloaterPreference::disableUnavailableSettings() ctrl_deferred->setEnabled(FALSE); ctrl_deferred->setValue(FALSE); + + // Tofu's SSR + ctrl_ssr->setEnabled(FALSE); + ctrl_ssr->setValue(FALSE); } // disabled deferred SSAO @@ -1651,6 +1668,10 @@ void LLFloaterPreference::disableUnavailableSettings() { ctrl_shadows->setEnabled(FALSE); ctrl_shadows->setValue(0); + + // Tofu's SSR + ctrl_ssr->setEnabled(FALSE); + ctrl_ssr->setValue(FALSE); } // disabled reflections @@ -1681,6 +1702,10 @@ void LLFloaterPreference::disableUnavailableSettings() ctrl_deferred->setEnabled(FALSE); ctrl_deferred->setValue(FALSE); + + // Tofu's SSR + ctrl_ssr->setEnabled(FALSE); + ctrl_ssr->setValue(FALSE); } // disabled cloth diff --git a/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml index 4bdf60f4be..462ed6e86d 100644 --- a/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml @@ -150,6 +150,7 @@ Sonstige Darstellungsoptionen: + diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml index 1f5db9c3ce..737b608664 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml @@ -328,6 +328,8 @@ top_pad="3" name="ShadowDetail" width="150"> + +