diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-04-03 19:21:14 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-04-03 19:21:14 +0000 |
| commit | b5936a4b1d8780b5b8cd425998eacd2c64ffa693 (patch) | |
| tree | c1581bcf34e96a897c6e1d9a4aed95f353713baa /indra/newview/app_settings | |
| parent | 55c25229b79b1755c989e5996c8e8d118f369721 (diff) | |
1.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426
QAR_367 (RC1) - merge Branch_1-19-1-Viewer -r 81609 : 81993 -> release
QAR-374 (RC2) - merge Branch_1-19-1-Viewer -r 81993 : 82589 -> release
QAR-408 (RC3) - merge Branch_1-19-1-Viewer -r 82589 : 83128 -> release
QAR-426 (rc4) - merge Branch_1-19-1-Viewer -r 83125 : 83719 -> release
(Actual merge: release@83793 Branch_1-19-1-Viewer-merge@83953 -> release)
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 32 | ||||
| -rw-r--r-- | indra/newview/app_settings/windlight/skies/A%2D6PM.xml | 11 |
2 files changed, 33 insertions, 10 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 93c06a474c..1a26783623 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -2608,10 +2608,10 @@ <string>Rect</string> <key>Value</key> <array> - <integer>0</integer> - <integer>400</integer> - <integer>400</integer> - <integer>0</integer> + <integer>16</integer> + <integer>650</integer> + <integer>600</integer> + <integer>128</integer> </array> </map> <key>FloaterMiniMapRect</key> @@ -5859,6 +5859,17 @@ <key>Value</key> <integer>0</integer> </map> + <key>SaveMinidump</key> + <map> + <key>Comment</key> + <string>Save minidump for developer debugging on crash</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> <key>ScaleShowAxes</key> <map> <key>Comment</key> @@ -8689,6 +8700,17 @@ <key>Value</key> <string /> </map> + <key>UseStartScreen</key> + <map> + <key>Comment</key> + <string>Whether to load a start screen image or not.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> <key>VFSOldSize</key> <map> <key>Comment</key> @@ -9669,7 +9691,7 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>1</integer> + <integer>0</integer> </map> <key>RenderDeferred</key> <map> diff --git a/indra/newview/app_settings/windlight/skies/A%2D6PM.xml b/indra/newview/app_settings/windlight/skies/A%2D6PM.xml index 6e82f2eb21..ebf08e1a3f 100644 --- a/indra/newview/app_settings/windlight/skies/A%2D6PM.xml +++ b/indra/newview/app_settings/windlight/skies/A%2D6PM.xml @@ -2,10 +2,10 @@ <map> <key>ambient</key> <array> - <real>0.14840038120746613</real> - <real>0.17633917927742004</real> - <real>0.23999999463558197</real> - <real>0.079999998211860657</real> + <real>1.0199999809265137</real> + <real>0.80999994277954102</real> + <real>0.80999994277954102</real> + <real>1.0199999809265137</real> </array> <key>blue_density</key> <array> @@ -70,7 +70,7 @@ </array> <key>distance_multiplier</key> <array> - <real>2.7000000476837158</real> + <real>1</real> <real>0</real> <real>0</real> <real>1</real> @@ -139,3 +139,4 @@ </array> </map> </llsd> + |