Second Life viewer sources 1.20.7

1 files changed, 10 insertions, 11 deletions

diff --git a/linden/indra/llwindow/lldxhardware.cpp b/linden/indra/llwindow/lldxhardware.cpp
index 4eb8cab..c2d94c3 100644
--- a/linden/indra/llwindow/lldxhardware.cpp
+++ b/linden/indra/llwindow/lldxhardware.cpp
@@ -304,7 +304,7 @@ BOOL LLDXHardware::getInfo(BOOL vram_only)
         IDxDiagContainer *driver_containerp = NULL;
 
     // CoCreate a IDxDiagProvider*
-        llinfos << "CoCreateInstance IID_IDxDiagProvider" << llendl;
+        LL_DEBUGS("AppInit") << "CoCreateInstance IID_IDxDiagProvider" << LL_ENDL;
     hr = CoCreateInstance(CLSID_DxDiagProvider,
                           NULL,
                           CLSCTX_INPROC_SERVER,
@@ -313,7 +313,7 @@ BOOL LLDXHardware::getInfo(BOOL vram_only)
 
         if (FAILED(hr))
         {
-                llwarns << "No DXDiag provider found!  DirectX 9 not installed!" << llendl;
+                LL_WARNS("AppInit") << "No DXDiag provider found!  DirectX 9 not installed!" << LL_ENDL;
                 gWriteDebug("No DXDiag provider found!  DirectX 9 not installed!\n");
                 goto LCleanup;
         }
@@ -331,14 +331,14 @@ BOOL LLDXHardware::getInfo(BOOL vram_only)
         dx_diag_init_params.bAllowWHQLChecks        = TRUE;
         dx_diag_init_params.pReserved               = NULL;
 
-                llinfos << "dx_diag_providerp->Initialize" << llendl;
+                LL_DEBUGS("AppInit") << "dx_diag_providerp->Initialize" << LL_ENDL;
         hr = dx_diag_providerp->Initialize(&dx_diag_init_params);
         if(FAILED(hr))
                 {
             goto LCleanup;
                 }
 
-                llinfos << "dx_diag_providerp->GetRootContainer" << llendl;
+                LL_DEBUGS("AppInit") << "dx_diag_providerp->GetRootContainer" << LL_ENDL;
         hr = dx_diag_providerp->GetRootContainer( &dx_diag_rootp );
         if(FAILED(hr) || !dx_diag_rootp)
                 {
@@ -348,7 +348,7 @@ BOOL LLDXHardware::getInfo(BOOL vram_only)
                 HRESULT hr;
 
                 // Get display driver information
-                llinfos << "dx_diag_rootp->GetChildContainer" << llendl;
+                LL_DEBUGS("AppInit") << "dx_diag_rootp->GetChildContainer" << LL_ENDL;
                 hr = dx_diag_rootp->GetChildContainer(L"DxDiag_DisplayDevices", &devices_containerp);
                 if(FAILED(hr) || !devices_containerp)
                 {
@@ -356,7 +356,7 @@ BOOL LLDXHardware::getInfo(BOOL vram_only)
                 }
 
                 // Get device 0
-                llinfos << "devices_containerp->GetChildContainer" << llendl;
+                LL_DEBUGS("AppInit") << "devices_containerp->GetChildContainer" << LL_ENDL;
                 hr = devices_containerp->GetChildContainer(L"0", &device_containerp);
                 if(FAILED(hr) || !device_containerp)
                 {
@@ -373,10 +373,9 @@ BOOL LLDXHardware::getInfo(BOOL vram_only)
                   // Dump the string as an int into the structure
                   char *stopstring;
                   mVRAM = strtol(ram_str.c_str(), &stopstring, 10); 
-                  llinfos << "VRAM Detected: " << mVRAM << " DX9 string: " << ram_str << llendl;
+                  LL_INFOS("AppInit") << "VRAM Detected: " << mVRAM << " DX9 string: " << ram_str << LL_ENDL;
                 }
 
-                
                 if (vram_only)
                 {
                         ok = TRUE;
@@ -393,7 +392,7 @@ BOOL LLDXHardware::getInfo(BOOL vram_only)
                 // This call may take some time while dxdiag gathers the info.
                 DWORD num_devices = 0;
             WCHAR wszContainer[256];
-                llinfos << "dx_diag_rootp->GetChildContainer DxDiag_SystemDevices" << llendl;
+                LL_DEBUGS("AppInit") << "dx_diag_rootp->GetChildContainer DxDiag_SystemDevices" << LL_ENDL;
                 hr = dx_diag_rootp->GetChildContainer(L"DxDiag_SystemDevices", &system_device_containerp);
                 if (FAILED(hr))
                 {
@@ -406,7 +405,7 @@ BOOL LLDXHardware::getInfo(BOOL vram_only)
                         goto LCleanup;
                 }
 
-                llinfos << "DX9 iterating over devices" << llendl;
+                LL_DEBUGS("AppInit") << "DX9 iterating over devices" << LL_ENDL;
                 S32 device_num = 0;
                 for (device_num = 0; device_num < (S32)num_devices; device_num++)
                 {
@@ -523,7 +522,7 @@ BOOL LLDXHardware::getInfo(BOOL vram_only)
 LCleanup:
         if (!ok)
         {
-                llwarns << "DX9 probe failed" << llendl;
+                LL_WARNS("AppInit") << "DX9 probe failed" << LL_ENDL;
                 gWriteDebug("DX9 probe failed\n");
         }