#3575 Clean up obsolete VRAM detectin logic

1 files changed, 1 insertions, 59 deletions

diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp
index aaf2a7ea3e..4f5fa53312 100644
--- a/indra/newview/llappviewerwin32.cpp
+++ b/indra/newview/llappviewerwin32.cpp
@@ -842,69 +842,11 @@ void write_debug_dx(const std::string& str)
 
 bool LLAppViewerWin32::initHardwareTest()
 {
-    //
-    // Do driver verification and initialization based on DirectX
-    // hardware polling and driver versions
-    //
-    if (true == gSavedSettings.getBOOL("ProbeHardwareOnStartup") && false == gSavedSettings.getBOOL("NoHardwareProbe"))
-    {
-        // per DEV-11631 - disable hardware probing for everything
-        // but vram.
-        bool vram_only = true;
-
-        LLSplashScreen::update(LLTrans::getString("StartupDetectingHardware"));
-
-        LL_DEBUGS("AppInit") << "Attempting to poll DirectX for hardware info" << LL_ENDL;
-        gDXHardware.setWriteDebugFunc(write_debug_dx);
-        bool probe_ok = gDXHardware.getInfo(vram_only);
-
-        if (!probe_ok
-            && gWarningSettings.getBOOL("AboutDirectX9"))
-        {
-            LL_WARNS("AppInit") << "DirectX probe failed, alerting user." << LL_ENDL;
-
-            // Warn them that runnin without DirectX 9 will
-            // not allow us to tell them about driver issues
-            std::ostringstream msg;
-            msg << LLTrans::getString ("MBNoDirectX");
-            S32 button = OSMessageBox(
-                msg.str(),
-                LLTrans::getString("MBWarning"),
-                OSMB_YESNO);
-            if (OSBTN_NO== button)
-            {
-                LL_INFOS("AppInit") << "User quitting after failed DirectX 9 detection" << LL_ENDL;
-                LLWeb::loadURLExternal("http://secondlife.com/support/", false);
-                return false;
-            }
-            gWarningSettings.setBOOL("AboutDirectX9", false);
-        }
-        LL_DEBUGS("AppInit") << "Done polling DirectX for hardware info" << LL_ENDL;
-
-        // Only probe once after installation
-        gSavedSettings.setBOOL("ProbeHardwareOnStartup", false);
-
-        // Disable so debugger can work
-        std::string splash_msg;
-        LLStringUtil::format_map_t args;
-        args["[APP_NAME]"] = LLAppViewer::instance()->getSecondLifeTitle();
-        splash_msg = LLTrans::getString("StartupLoading", args);
-
-        LLSplashScreen::update(splash_msg);
-    }
-
     if (!restoreErrorTrap())
     {
-        LL_WARNS("AppInit") << " Someone took over my exception handler (post hardware probe)!" << LL_ENDL;
+        LL_WARNS("AppInit") << " Someone took over my exception handler!" << LL_ENDL;
     }
 
-    if (gGLManager.mVRAM == 0)
-    {
-        gGLManager.mVRAM = gDXHardware.getVRAM();
-    }
-
-    LL_INFOS("AppInit") << "Detected VRAM: " << gGLManager.mVRAM << LL_ENDL;
-
     return true;
 }