summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterpreference.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llfloaterpreference.cpp')
-rw-r--r--[-rwxr-xr-x]indra/newview/llfloaterpreference.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 8c9dfe435a..952643326a 100755..100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -656,6 +656,13 @@ void LLFloaterPreference::onOpen(const LLSD& key)
getChildView("maturity_desired_combobox")->setVisible( false);
}
+ bool enable_mesh = gSavedSettings.getBOOL("MeshEnabled");
+
+ getChildView("UseLightShaders")->setVisible(enable_mesh);
+ getChildView("UseSSAO")->setVisible(enable_mesh);
+ getChildView("shadows_label")->setVisible(enable_mesh);
+ getChildView("ShadowDetail")->setVisible(enable_mesh);
+
if (LLStartUp::getStartupState() == STATE_STARTED)
{
mFavoritesRecordMayExist = gSavedPerAccountSettings.getBOOL("ShowFavoritesOnLogin");
@@ -1036,8 +1043,7 @@ void LLFloaterPreference::refreshEnabledState()
//Deferred/SSAO/Shadows
LLCheckBoxCtrl* ctrl_deferred = getChild<LLCheckBoxCtrl>("UseLightShaders");
- if (LLFeatureManager::getInstance()->isFeatureAvailable("RenderUseFBO") &&
- LLFeatureManager::getInstance()->isFeatureAvailable("RenderDeferred") &&
+ if (LLFeatureManager::getInstance()->isFeatureAvailable("RenderDeferred") &&
shaders)
{
BOOL enabled = (ctrl_wind_light->get()) ? TRUE : FALSE;