diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-06-10 18:31:07 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-10 18:31:07 +0300 |
| commit | 737bf1ba9431aa35e2e510c5de76fd6a632c61b8 (patch) | |
| tree | 08e343c11fccda03b28aaf2cec34a06c98d8aa77 /indra/newview/llappviewer.cpp | |
| parent | 34dfd7d5996b1b6117c2155bb95aeb377038bb6e (diff) | |
| parent | 13b08c8ae1c3b92236f156fba5686f231abfb711 (diff) | |
Merge pull request #1676 from Ansariel/DRTVWR-600-maint-A
Re-enable compiler warnings C4018, C4100, C4231 and C4506
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index fd37980ef4..5a04494663 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -3339,7 +3339,7 @@ LLSD LLAppViewer::getViewerInfo() const info["NET_BANDWITH"] = gSavedSettings.getF32("ThrottleBandwidthKBPS"); info["LOD_FACTOR"] = gSavedSettings.getF32("RenderVolumeLODFactor"); info["RENDER_QUALITY"] = (F32)gSavedSettings.getU32("RenderQualityPerformance"); - info["TEXTURE_MEMORY"] = gGLManager.mVRAM; + info["TEXTURE_MEMORY"] = LLSD::Integer(gGLManager.mVRAM); #if LL_DARWIN info["HIDPI"] = gHiDPISupport; |