diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-05-02 20:29:59 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-05-02 20:29:59 +0000 |
| commit | bc59c04653bf1404e8148a8169208b146a123b28 (patch) | |
| tree | 06407251fd587dd9c3cd1ef907fc1f3c1656fa6e | |
| parent | eb3731a3ca0d202809ed20a0f49a7a77ecd4c669 (diff) | |
svn merge -r 61255:61259 svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate --> release
| -rw-r--r-- | indra/newview/gpu_table.txt | 8 | ||||
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 21 |
2 files changed, 4 insertions, 25 deletions
diff --git a/indra/newview/gpu_table.txt b/indra/newview/gpu_table.txt index 4e6373d57e..a6d1deea1e 100644 --- a/indra/newview/gpu_table.txt +++ b/indra/newview/gpu_table.txt @@ -22,11 +22,9 @@ ATI All-in-Wonder X1800 .*ATI.*All-in-Wonder X18.* 3 ATI All-in-Wonder X1900 .*ATI.*All-in-Wonder X19.* 3 ATI ASUS X1xxx .*ASUS X1.* 3 ATI Mobility Radeon X1xxx .*ATI.*Mobility.*X1.* 2 -// HACK: We crash on startup on some Mobility Radeon chips, with 1.15.0 -// in FMOD (!). Try defaulting them to class 0. JC -ATI Mobility Radeon X3xx .*ATI.*Mobility.*X3.* 0 -ATI Mobility Radeon X6xx .*ATI.*Mobility.*X6.* 0 -ATI Mobility Radeon X7xx .*ATI.*Mobility.*X7.* 0 +ATI Mobility Radeon X3xx .*ATI.*Mobility.*X3.* 1 +ATI Mobility Radeon X6xx .*ATI.*Mobility.*X6.* 1 +ATI Mobility Radeon X7xx .*ATI.*Mobility.*X7.* 1 ATI Radeon OpenGL .*ATI.*Radeon OpenGL.* 3 ATI Diamond X1xxx .*ATI.*Diamond.*X1.* 3 ATI FireGL 5xxx .*ATI.*FireGL V5.* 3 diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 1b3c0193f4..f276999380 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1484,27 +1484,8 @@ LLViewerWindow::LLViewerWindow( // stuff like AGP if we think that it'll crash the viewer. // gFeatureManagerp->initGraphicsFeatureMasks(); - - // The ATI Mobility Radeon with 1.15.0 causes crashes in FMOD on startup for - // unknown reasons, but only if you have an old settings.ini file. - // In this case, force the graphics settings back to recommended, but only - // do it once. JC - std::string gpu_string = gFeatureManagerp->getGPUString(); - LLString::toLower(gpu_string); - bool upgrade_to_1_15 = (gSavedSettings.getString("LastRunVersion") != "1.15.0"); - bool mobility_radeon = (gpu_string.find("mobility radeon") != std::string::npos); - bool mobility_radeon_upgrade_hack = upgrade_to_1_15 && mobility_radeon; - if (mobility_radeon_upgrade_hack) - { - llinfos << "1.15.0 update on Mobility Radeon" << llendl; - llinfos << "Forcing recommended graphics settings" << llendl; - llinfos << "Forcing audio off" << llendl; - gUseAudio = FALSE; - } - if (gFeatureManagerp->isSafe() - || (gSavedSettings.getS32("LastFeatureVersion") != gFeatureManagerp->getVersion()) - || mobility_radeon_upgrade_hack) + || (gSavedSettings.getS32("LastFeatureVersion") != gFeatureManagerp->getVersion())) { gFeatureManagerp->applyRecommendedFeatures(); } |