diff --git a/indra/newview/app_settings/cmd_line.xml b/indra/newview/app_settings/cmd_line.xml index 5936c5b045..61874be438 100755 --- a/indra/newview/app_settings/cmd_line.xml +++ b/indra/newview/app_settings/cmd_line.xml @@ -449,14 +449,14 @@ - forcememory + forcevideomemory desc Overrides the video memory detection on Windows if a value greater 0 is passed count 1 map-to - FSForcedMemory + FSForcedVideoMemory diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 86a0855a8f..8d01572b4a 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -21711,7 +21711,7 @@ Change of this parameter will affect the layout of buttons in notification toast Value 1 - FSForcedMemory + FSForcedVideoMemory Comment Overrides the video memory detection on Windows if a value greater 0 is passed (in case DirectX memory detection fails or is wrong) diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp index 27591b3154..3361b47f10 100755 --- a/indra/newview/llappviewerwin32.cpp +++ b/indra/newview/llappviewerwin32.cpp @@ -597,11 +597,11 @@ bool LLAppViewerWin32::initHardwareTest() if (gGLManager.mVRAM == 0) { // FIRE-12671: Force VRAM if DirectX detection is broken - S32 forced_memory; - if ((forced_memory = gSavedSettings.getS32("FSForcedMemory")) > 0) + S32 forced_video_memory; + if ((forced_video_memory = gSavedSettings.getS32("FSForcedVideoMemory")) > 0) { - LL_INFOS("AppInit") << "Forcing VRAM to " << forced_memory << " MB" << LL_ENDL; - gGLManager.mVRAM = forced_memory; + LL_INFOS("AppInit") << "Forcing VRAM to " << forced_video_memory << " MB" << LL_ENDL; + gGLManager.mVRAM = forced_video_memory; } else //