Automated merge with head of viewer64

Wed, 13 Dec 2017 12:39:37 -0800

author
callum_linden <callum@lindenlab.com>
date
Wed, 13 Dec 2017 12:39:37 -0800
changeset 55043
4746dc195835
parent 55042
6745802f81bd
parent 54577
4200f867c0e0
child 55044
3516b95e9d6c

Automated merge with head of viewer64

autobuild.xml file | annotate | diff | revisions
     1.1 --- a/autobuild.xml	Mon Dec 11 13:09:52 2017 -0800
     1.2 +++ b/autobuild.xml	Wed Dec 13 12:39:37 2017 -0800
     1.3 @@ -3231,9 +3231,9 @@
     1.4              <key>archive</key>
     1.5              <map>
     1.6                <key>hash</key>
     1.7 -              <string>92235fabdca2d3865014f7ec630e2688</string>
     1.8 +              <string>8bb2754bb078713f875e7374c95294fc</string>
     1.9                <key>url</key>
    1.10 -              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11444/64857/viewer_manager-1.0.511221-darwin64-511221.tar.bz2</string>
    1.11 +              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11619/66949/viewer_manager-1.0.511355-darwin64-511355.tar.bz2</string>
    1.12              </map>
    1.13              <key>name</key>
    1.14              <string>darwin64</string>
    1.15 @@ -3255,9 +3255,9 @@
    1.16              <key>archive</key>
    1.17              <map>
    1.18                <key>hash</key>
    1.19 -              <string>bfea9c61d0b29d741081c0c8a315d364</string>
    1.20 +              <string>cc406ba4d9250e4c959c99b64877248f</string>
    1.21                <key>url</key>
    1.22 -              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11446/64863/viewer_manager-1.0.511221-windows-511221.tar.bz2</string>
    1.23 +              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11620/66955/viewer_manager-1.0.511355-windows-511355.tar.bz2</string>
    1.24              </map>
    1.25              <key>name</key>
    1.26              <string>windows</string>
    1.27 @@ -3268,7 +3268,7 @@
    1.28          <key>source_type</key>
    1.29          <string>hg</string>
    1.30          <key>version</key>
    1.31 -        <string>1.0.511221</string>
    1.32 +        <string>1.0.511355</string>
    1.33        </map>
    1.34        <key>vlc-bin</key>
    1.35        <map>
     2.1 --- a/indra/newview/app_settings/settings.xml	Mon Dec 11 13:09:52 2017 -0800
     2.2 +++ b/indra/newview/app_settings/settings.xml	Wed Dec 13 12:39:37 2017 -0800
     2.3 @@ -12332,7 +12332,7 @@
     2.4      <key>UpdaterMaximumBandwidth</key>
     2.5      <map>
     2.6        <key>Comment</key>
     2.7 -      <string>Maximum allowable downstream bandwidth for updater service (kilo bits per second)</string>
     2.8 +      <string>Obsolete: this parameter is no longer used.</string>
     2.9        <key>Persist</key>
    2.10        <integer>1</integer>
    2.11        <key>Type</key>

mercurial