diff options
| author | Richard Linden <none@none> | 2010-12-08 17:28:27 -0800 | 
|---|---|---|
| committer | Richard Linden <none@none> | 2010-12-08 17:28:27 -0800 | 
| commit | cf6147f7c092e6ca10697dea341099c5e281df00 (patch) | |
| tree | 43bc682aa65f5d6fa45c33bf48b2a0765d768b23 | |
| parent | e17eea11a8befd5c09a0975a1b7b7ec6bb667368 (diff) | |
EXP-465 FIX Viewer window does not fill screen on Mac and Linux using --fullscreen
disabled fullscreen mode for merge to viewer-development
| -rw-r--r-- | indra/newview/app_settings/cmd_line.xml | 7 | ||||
| -rw-r--r-- | indra/newview/llappviewer.cpp | 3 | 
2 files changed, 3 insertions, 7 deletions
| diff --git a/indra/newview/app_settings/cmd_line.xml b/indra/newview/app_settings/cmd_line.xml index 294d85eac1..e4ac455e7c 100644 --- a/indra/newview/app_settings/cmd_line.xml +++ b/indra/newview/app_settings/cmd_line.xml @@ -392,13 +392,6 @@        <string>CrashOnStartup</string>      </map> -    <key>fullscreen</key> -    <map> -      <key>desc</key> -      <string>Force full screen mode</string> -      <key>map-to</key> -      <string>WindowFullScreen</string> -    </map>      <key>disablecrashlogger</key>      <map>        <key>desc</key> diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index cd53fb8970..b460885a53 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -505,6 +505,9 @@ static void settings_modify()  	gSavedSettings.setBOOL("VectorizeEnable", FALSE );  	gSavedSettings.setU32("VectorizeProcessor", 0 );  	gSavedSettings.setBOOL("VectorizeSkin", FALSE); + +	// disable fullscreen mode, unsupported +	gSavedSettings.setBOOL("WindowFullScreen", FALSE);  #endif  } | 
