diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-10-20 16:45:31 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-10-20 16:45:31 -0400 |
| commit | aa2ea71412b256413fe9a244e96f69d626bb8eef (patch) | |
| tree | f76fb6c801917203d3f15947f110a8602abbf7e3 /indra/newview/llviewerwindow.cpp | |
| parent | 140ce422b8f7e57316794367335975110ed8a4b0 (diff) | |
| parent | 02e1578365627b3be265fa733f1206897c51ee77 (diff) | |
merge changes for storm-1581
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index b84db6b1c0..8576d81196 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1657,7 +1657,7 @@ LLViewerWindow::LLViewerWindow( if (LLFeatureManager::getInstance()->isSafe() || (gSavedSettings.getS32("LastFeatureVersion") != LLFeatureManager::getInstance()->getVersion()) - || (gSavedSettings.getS32("LastGPUClass") != LLFeatureManager::getInstance()->getGPUClass()) + || (gSavedSettings.getString("LastGPUString") != LLFeatureManager::getInstance()->getGPUString()) || (gSavedSettings.getBOOL("ProbeHardwareOnStartup"))) { LLFeatureManager::getInstance()->applyRecommendedSettings(); |