Merge viewer-media-update

Fri, 02 Mar 2018 12:11:50 +0100

author
Ansariel
date
Fri, 02 Mar 2018 12:11:50 +0100
changeset 55081
cd11db88290d
parent 55077
a6108d1c5449
parent 55080
7d60d617f377
child 55082
c230dd5e6f29

Merge viewer-media-update

autobuild.xml file | annotate | diff | revisions
indra/media_plugins/cef/media_plugin_cef.cpp file | annotate | diff | revisions
     1.1 --- a/autobuild.xml	Fri Mar 02 12:06:56 2018 +0100
     1.2 +++ b/autobuild.xml	Fri Mar 02 12:11:50 2018 +0100
     1.3 @@ -756,9 +756,9 @@
     1.4              <key>archive</key>
     1.5              <map>
     1.6                <key>hash</key>
     1.7 -              <string>35b3fca493235ff590c5bb58b28f56bd</string>
     1.8 -              <key>url</key>
     1.9 -              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/13031/79689/dullahan-1.1.1040_3.3239.1723.g071d1c1-darwin64-512263.tar.bz2</string>
    1.10 +              <string>06e6bb2aa2614b6a7b86a08dce8746ad</string>
    1.11 +              <key>url</key>
    1.12 +              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/14190/88872/dullahan-1.1.1050_3.3282.1742.g96f907e-darwin64-512926.tar.bz2</string>
    1.13              </map>
    1.14              <key>name</key>
    1.15              <string>darwin64</string>
    1.16 @@ -792,9 +792,9 @@
    1.17              <key>archive</key>
    1.18              <map>
    1.19                <key>hash</key>
    1.20 -              <string>dc8a50e9afc7ff974faec8301e8eb6a3</string>
    1.21 -              <key>url</key>
    1.22 -              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/13032/79696/dullahan-1.1.1040_3.3239.1723.g071d1c1-windows-512263.tar.bz2</string>
    1.23 +              <string>59b5f320601c1a57d1706dcc791a4110</string>
    1.24 +              <key>url</key>
    1.25 +              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/14191/88879/dullahan-1.1.1050_3.3282.1742.g96f907e-windows-512926.tar.bz2</string>
    1.26              </map>
    1.27              <key>name</key>
    1.28              <string>windows</string>
    1.29 @@ -804,16 +804,16 @@
    1.30              <key>archive</key>
    1.31              <map>
    1.32                <key>hash</key>
    1.33 -              <string>fd45e9c73d334e0093a67b7b94abb994</string>
    1.34 -              <key>url</key>
    1.35 -              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/13033/79701/dullahan-1.1.1040_3.3239.1723.g071d1c1-windows64-512263.tar.bz2</string>
    1.36 +              <string>0d2da40e7c187bfb3f366561836e40a8</string>
    1.37 +              <key>url</key>
    1.38 +              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/14192/88884/dullahan-1.1.1050_3.3282.1742.g96f907e-windows64-512926.tar.bz2</string>
    1.39              </map>
    1.40              <key>name</key>
    1.41              <string>windows64</string>
    1.42            </map>
    1.43          </map>
    1.44          <key>version</key>
    1.45 -        <string>1.1.1040_3.3239.1723.g071d1c1</string>
    1.46 +        <string>1.1.1050_3.3282.1742.g96f907e</string>
    1.47        </map>
    1.48        <key>elfio</key>
    1.49        <map>
     2.1 --- a/indra/media_plugins/cef/media_plugin_cef.cpp	Fri Mar 02 12:06:56 2018 +0100
     2.2 +++ b/indra/media_plugins/cef/media_plugin_cef.cpp	Fri Mar 02 12:11:50 2018 +0100
     2.3 @@ -496,7 +496,7 @@
     2.4  
     2.5  				dullahan::dullahan_settings settings;
     2.6  				settings.accept_language_list = mHostLanguage;
     2.7 -				settings.background_color = 0xffffffff;
     2.8 +				settings.background_color = 0xff282828;
     2.9  				settings.cache_enabled = true;
    2.10  				settings.cache_path = mCachePath;
    2.11  				settings.cookie_store_path = mCookiePath;

mercurial