diff options
| author | simon <none@none> | 2013-05-29 14:42:19 -0700 |
|---|---|---|
| committer | simon <none@none> | 2013-05-29 14:42:19 -0700 |
| commit | 507ce0d84fc3e7717c7c9ae58dcdae7785936f65 (patch) | |
| tree | a7dde82693b2297a27024a00624c1ec9f81c2d0c /indra/newview/app_settings | |
| parent | 473474b94969799d2835191072c5bca1b7d431d8 (diff) | |
| parent | 3698aece0d2b396b55b46189e8ea7ee02da9483b (diff) | |
Merge downstream code
Diffstat (limited to 'indra/newview/app_settings')
| -rwxr-xr-x | indra/newview/app_settings/settings.xml | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 7cb45559fa..aa38b9dc2a 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -1905,6 +1905,17 @@ <key>Value</key> <integer>0</integer> </map> + <key>CoroutineStackSize</key> + <map> + <key>Comment</key> + <string>Size (in bytes) for each coroutine stack</string> + <key>Persist</key> + <integer>0</integer> + <key>Type</key> + <string>S32</string> + <key>Value</key> + <integer>262144</integer> + </map> <key>CreateToolCopyCenters</key> <map> <key>Comment</key> @@ -12549,6 +12560,17 @@ <key>Value</key> <string>update</string> </map> + <key>UpdaterWillingToTest</key> + <map> + <key>Comment</key> + <string>Whether or not the updater should offer test candidate upgrades.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <string>1</string> + </map> <key>UploadBakedTexOld</key> <map> <key>Comment</key> |