diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-10-12 17:05:36 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-10-12 17:05:36 -0400 |
| commit | 7b2b23c2b0e39564c8661894b5d847ce6337d207 (patch) | |
| tree | 46990a53fa3cf357ef55e22fb0d658e51276fd6b /indra | |
| parent | f1335361ecf14e32eda0055a527c4a5c24e20554 (diff) | |
SH-319 FIXED Anti-aliasing enable/disable not preserved correctly when cancel out of preferences
Added RenderUseFBO to list of parameters to be restored upon preference dialog cancel.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfloaterhardwaresettings.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/llfloaterhardwaresettings.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llfloaterhardwaresettings.cpp b/indra/newview/llfloaterhardwaresettings.cpp index 0e89ca966a..c6e5126ab1 100644 --- a/indra/newview/llfloaterhardwaresettings.cpp +++ b/indra/newview/llfloaterhardwaresettings.cpp @@ -50,6 +50,7 @@ LLFloaterHardwareSettings::LLFloaterHardwareSettings(const LLSD& key) // but init them anyway mUseVBO(0), mUseAniso(0), + mUseFBO(0), mFSAASamples(0), mGamma(0.0), mVideoCardMem(0), @@ -75,6 +76,7 @@ void LLFloaterHardwareSettings::refresh() mUseVBO = gSavedSettings.getBOOL("RenderVBOEnable"); mUseAniso = gSavedSettings.getBOOL("RenderAnisotropic"); + mUseFBO = gSavedSettings.getBOOL("RenderUseFBO"); mFSAASamples = gSavedSettings.getU32("RenderFSAASamples"); mGamma = gSavedSettings.getF32("RenderGamma"); mVideoCardMem = gSavedSettings.getS32("TextureMemory"); @@ -160,6 +162,7 @@ void LLFloaterHardwareSettings::cancel() { gSavedSettings.setBOOL("RenderVBOEnable", mUseVBO); gSavedSettings.setBOOL("RenderAnisotropic", mUseAniso); + gSavedSettings.setBOOL("RenderUseFBO", mUseFBO); gSavedSettings.setU32("RenderFSAASamples", mFSAASamples); gSavedSettings.setF32("RenderGamma", mGamma); gSavedSettings.setS32("TextureMemory", mVideoCardMem); diff --git a/indra/newview/llfloaterhardwaresettings.h b/indra/newview/llfloaterhardwaresettings.h index f59b77b17f..626771b1d2 100644 --- a/indra/newview/llfloaterhardwaresettings.h +++ b/indra/newview/llfloaterhardwaresettings.h @@ -70,6 +70,7 @@ public: protected: BOOL mUseVBO; BOOL mUseAniso; + BOOL mUseFBO; U32 mFSAASamples; F32 mGamma; S32 mVideoCardMem; |