Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Preferences Refactor] Handle Hardware tab earlier to avoid early return when custom isn't displayed

Browse Source
This commit is contained in:
Inusaito Sayori
2014-06-02 20:25:01 -04:00
parent ac106b0aff
commit 95106ca1c2
1 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
indra/newview/llpaneldisplay.cpp
View File

@@ -434,6 +434,28 @@ void LLPanelDisplay::refreshEnabledState()
mAspectRatioLabel1->setVisible(isFullScreen); mAspectRatioLabel1->setVisible(isFullScreen);
mCtrlAutoDetectAspect->setVisible(isFullScreen); mCtrlAutoDetectAspect->setVisible(isFullScreen);
// Hardware tab
getChild<LLUICtrl>("GrapicsCardTextureMemory")->setMinValue(LLViewerTextureList::getMinVideoRamSetting());
getChild<LLUICtrl>("GrapicsCardTextureMemory")->setMaxValue(LLViewerTextureList::getMaxVideoRamSetting());
if (!LLFeatureManager::getInstance()->isFeatureAvailable("RenderVBOEnable") ||
!gGLManager.mHasVertexBufferObject)
{
mVBO->setEnabled(false);
//Streaming VBOs -Shyotl
mVBOStream->setEnabled(false);
}
else
{
mVBOStream->setEnabled(gSavedSettings.getBOOL("RenderVBOEnable"));
}
static LLCachedControl<bool> wlatmos("WindLightUseAtmosShaders",false);
// if no windlight shaders, enable gamma, and fog distance
getChildView("gamma")->setEnabled(!wlatmos);
getChildView("fog")->setEnabled(!wlatmos);
getChildView("note")->setVisible(wlatmos);
// disable graphics settings and exit if it's not set to custom // disable graphics settings and exit if it's not set to custom
if(!gSavedSettings.getBOOL("RenderCustomSettings")) if(!gSavedSettings.getBOOL("RenderCustomSettings"))
{ {
@@ -467,7 +489,6 @@ void LLPanelDisplay::refreshEnabledState()
mCtrlAvatarCloth->setEnabled(true); mCtrlAvatarCloth->setEnabled(true);
} }
static LLCachedControl<bool> wlatmos("WindLightUseAtmosShaders",false);
//I actually recommend RenderUseFBO:FALSE for ati users when not using deferred, so RenderUseFBO shouldn't control visibility of the element. //I actually recommend RenderUseFBO:FALSE for ati users when not using deferred, so RenderUseFBO shouldn't control visibility of the element.
// Instead, gGLManager.mHasFramebufferObject seems better as it is determined by hardware and not current user settings. -Shyotl // Instead, gGLManager.mHasFramebufferObject seems better as it is determined by hardware and not current user settings. -Shyotl
//Enabling deferred will force RenderUseFBO to TRUE. //Enabling deferred will force RenderUseFBO to TRUE.
@@ -539,28 +560,6 @@ void LLPanelDisplay::refreshEnabledState()
mCtrlAvatarVP->setEnabled(true); mCtrlAvatarVP->setEnabled(true);
} }
// Hardware tab
S32 min_tex_mem = LLViewerTextureList::getMinVideoRamSetting();
S32 max_tex_mem = LLViewerTextureList::getMaxVideoRamSetting();
childSetMinValue("GrapicsCardTextureMemory", min_tex_mem);
childSetMaxValue("GrapicsCardTextureMemory", max_tex_mem);
if (!LLFeatureManager::getInstance()->isFeatureAvailable("RenderVBOEnable") ||
!gGLManager.mHasVertexBufferObject)
{
mVBO->setEnabled(false);
//Streaming VBOs -Shyotl
mVBOStream->setEnabled(false);
}
else
{
mVBOStream->setEnabled(gSavedSettings.getBOOL("RenderVBOEnable"));
}
// if no windlight shaders, enable gamma, and fog distance
childSetEnabled("gamma",!wlatmos);
childSetEnabled("fog", !wlatmos);
childSetVisible("note", wlatmos);
// now turn off any features that are unavailable // now turn off any features that are unavailable
disableUnavailableSettings(); disableUnavailableSettings();