diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-06-18 10:18:08 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-06-18 10:18:08 -0400 |
| commit | 172e8edcb0cfa1a0f68ce4d8bcb89c9d53659585 (patch) | |
| tree | 6668062a9c8eac989e9c43a579b4e8d06256b76f /indra/newview/app_settings | |
| parent | d3b9c8944b7730b54796ef79cd78d62fd585fe42 (diff) | |
| parent | cb50a2395bc37f1f7833171a976f67af9f2df66d (diff) | |
automated merge
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 37 |
1 files changed, 2 insertions, 35 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index fe6bd8eef0..2244f05104 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -3589,17 +3589,6 @@ <key>Value</key> <integer>0</integer> </map> - <key>FullScreen</key> - <map> - <key>Comment</key> - <string>Run SL in fullscreen mode</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>0</integer> - </map> <key>FullScreenAspectRatio</key> <map> <key>Comment</key> @@ -3609,7 +3598,7 @@ <key>Type</key> <string>F32</string> <key>Value</key> - <real>1.33329999447</real> + <real>3</real> </map> <key>FullScreenAutoDetectAspectRatio</key> <map> @@ -3620,29 +3609,7 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>1</integer> - </map> - <key>FullScreenHeight</key> - <map> - <key>Comment</key> - <string>Fullscreen resolution in height</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>S32</string> - <key>Value</key> - <integer>768</integer> - </map> - <key>FullScreenWidth</key> - <map> - <key>Comment</key> - <string>Fullscreen resolution in width</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>S32</string> - <key>Value</key> - <integer>1024</integer> + <integer>0</integer> </map> <key>GesturesMarketplaceURL</key> <map> |