livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

And make it even more obvious...

Ansariel 2014-01-11 19:59:07 +01:00
parent f2a82c4f5f
commit a3dc7915f4
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/app_settings/cmd_line.xml
View File

@ -449,14 +449,14 @@
<! FS:Ansariel - Option to not auto-save passwords when using login option -->
<!-- FS:Ansariel FIRE-12671: Force VRAM if DirectX detection is broken -->
<key>forcememory</key>
<key>forcevideomemory</key>
<map>
<key>desc</key>
<string>Overrides the video memory detection on Windows if a value greater 0 is passed</string>
<key>count</key>
<integer>1</integer>
<key>map-to</key>
<string>FSForcedMemory</string>
<string>FSForcedVideoMemory</string>
</map>
<!-- FS:Ansariel -->

2
indra/newview/app_settings/settings.xml
View File

@ -21711,7 +21711,7 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Value</key>
<integer>1</integer>
</map>
<key>FSForcedMemory</key>
<key>FSForcedVideoMemory</key>
<map>
<key>Comment</key>
<string>Overrides the video memory detection on Windows if a value greater 0 is passed (in case DirectX memory detection fails or is wrong)</string>

8
indra/newview/llappviewerwin32.cpp
View File

@ -597,11 +597,11 @@ bool LLAppViewerWin32::initHardwareTest()
if (gGLManager.mVRAM == 0)
{
// <FS:Ansariel> 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
// </FS:Ansariel>