diff options
| author | dolphin <dolphin@lindenlab.com> | 2013-05-20 10:08:27 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2013-05-20 10:08:27 -0700 |
| commit | 716a963d5544977863d07770c3c6449b3d9897bb (patch) | |
| tree | 36ce3c4707851bb04f557d790fe410d26a009293 /indra/newview/app_settings/settings.xml | |
| parent | 6308f93c6adddc9d396e8d2527e97e0d02c4aa52 (diff) | |
| parent | 0ebcb7e3fd1452d42b5ca48139f99a4fd632d235 (diff) | |
Merge with viewer-release
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
| -rwxr-xr-x | indra/newview/app_settings/settings.xml | 40 |
1 files changed, 15 insertions, 25 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 3281d347a7..31c730e0bc 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -11194,7 +11194,7 @@ <key>Type</key> <string>F32</string> <key>Value</key> - <integer>0.0</integer> + <real>0.0</real> </map> <key>TextureFetchUpdateSkipLowPriority</key> <map> @@ -12450,6 +12450,17 @@ <key>Value</key> <integer>3</integer> </map> + <key>UpdaterWillingToTest</key> + <map> + <key>Comment</key> + <string>Allow upgrades to release candidate viewers with new features and fixes.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> <key>UpdaterServiceCheckPeriod</key> <map> <key>Comment</key> @@ -12483,17 +12494,6 @@ <key>Value</key> <string>update</string> </map> - <key>UpdaterServiceProtocolVersion</key> - <map> - <key>Comment</key> - <string>The update protocol version to use.</string> - <key>Persist</key> - <integer>0</integer> - <key>Type</key> - <string>String</string> - <key>Value</key> - <string>v1.0</string> - </map> <key>UploadBakedTexOld</key> <map> <key>Comment</key> @@ -12833,6 +12833,7 @@ <key>Type</key> <string>LLSD</string> <key>Value</key> + <string/> </map> <key>VFSOldSize</key> <map> @@ -13459,7 +13460,7 @@ <key>Type</key> <string>F32</string> <key>Value</key> - <integer>-1.0</integer> + <real>-1.0</real> </map> <key>ForcePeriodicRenderingTime</key> <map> @@ -13470,7 +13471,7 @@ <key>Type</key> <string>F32</string> <key>Value</key> - <integer>-1.0</integer> + <real>-1.0</real> </map> <key>ZoomDirect</key> <map> @@ -14501,16 +14502,5 @@ <key>Value</key> <integer>7000</integer> </map> - <key>DisablePrecacheDelayAfterTeleporting</key> - <map> - <key>Comment</key> - <string>Disables the artificial delay in the viewer that precaches some incoming assets</string> - <key>Persist</key> - <integer>0</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>0</integer> - </map> </map> </llsd> |