diff options
| author | Andrew A. de Laix <alain@lindenlab.com> | 2010-11-04 14:08:38 -0700 |
|---|---|---|
| committer | Andrew A. de Laix <alain@lindenlab.com> | 2010-11-04 14:08:38 -0700 |
| commit | 070fe9ed262da5c990a5129474489647a0369fc9 (patch) | |
| tree | a7fdd231cc6e84065152048bc5671d428706d801 /indra/newview/app_settings/settings.xml | |
| parent | e0c734a7105060740e5597d4439d882bb3f2bff4 (diff) | |
| parent | dfeb7abe5f690bbd3a908c84c53bbea20a5adb7c (diff) | |
Automated merge with https://bitbucket.org/mani_linden/viewer-development/
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 8f5cb7c709..cc0e0a78db 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -11022,7 +11022,29 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>http://localhost/agni</string> + <string>http://update.secondlife.com</string> + </map> + <key>UpdaterServicePath</key> + <map> + <key>Comment</key> + <string>Path on the update server host.</string> + <key>Persist</key> + <integer>0</integer> + <key>Type</key> + <string>String</string> + <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> |