summaryrefslogtreecommitdiff
path: root/indra/llwindow/lldxhardware.cpp
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2024-06-10 18:31:07 +0300
committerGitHub <noreply@github.com>2024-06-10 18:31:07 +0300
commit737bf1ba9431aa35e2e510c5de76fd6a632c61b8 (patch)
tree08e343c11fccda03b28aaf2cec34a06c98d8aa77 /indra/llwindow/lldxhardware.cpp
parent34dfd7d5996b1b6117c2155bb95aeb377038bb6e (diff)
parent13b08c8ae1c3b92236f156fba5686f231abfb711 (diff)
Merge pull request #1676 from Ansariel/DRTVWR-600-maint-A
Re-enable compiler warnings C4018, C4100, C4231 and C4506
Diffstat (limited to 'indra/llwindow/lldxhardware.cpp')
-rw-r--r--indra/llwindow/lldxhardware.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llwindow/lldxhardware.cpp b/indra/llwindow/lldxhardware.cpp
index 0830dc9528..cba820fcab 100644
--- a/indra/llwindow/lldxhardware.cpp
+++ b/indra/llwindow/lldxhardware.cpp
@@ -216,7 +216,7 @@ HRESULT GetVideoMemoryViaWMI(WCHAR* strInputDeviceID, DWORD* pdwAdapterRam)
}
//static
-S32 LLDXHardware::getMBVideoMemoryViaWMI()
+U32 LLDXHardware::getMBVideoMemoryViaWMI()
{
DWORD vram = 0;
if (SUCCEEDED(GetVideoMemoryViaWMI(NULL, &vram)))