diff options
| author | palange <palange@lindenlab.com> | 2010-05-28 09:35:46 -0700 |
|---|---|---|
| committer | palange <palange@lindenlab.com> | 2010-05-28 09:35:46 -0700 |
| commit | 88d7073593ccf590d7b2b8e69c58c89029f8466e (patch) | |
| tree | 0070c9addec90cfb9b046f5611ca6ac98f74ed0b /indra/newview/llviewerwindow.cpp | |
| parent | a6a9e893930584db90a57263211b7eac787085a0 (diff) | |
| parent | c901048d98a68a992cf1945e5802ec34087f67bb (diff) | |
Automated merge with ssh://hg.lindenlab.com/palange/viewer-2-0
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index da4ff1568b..d91f232f0e 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1432,6 +1432,7 @@ LLViewerWindow::LLViewerWindow( if (LLFeatureManager::getInstance()->isSafe() || (gSavedSettings.getS32("LastFeatureVersion") != LLFeatureManager::getInstance()->getVersion()) + || (gSavedSettings.getS32("LastGPUClass") != LLFeatureManager::getInstance()->getGPUClass()) || (gSavedSettings.getBOOL("ProbeHardwareOnStartup"))) { LLFeatureManager::getInstance()->applyRecommendedSettings(); |