diff options
| -rw-r--r-- | autobuild.xml | 186 | ||||
| -rw-r--r-- | indra/llcommon/llsingleton.cpp | 2 | ||||
| -rw-r--r-- | indra/llplugin/llpluginprocessparent.cpp | 6 | ||||
| -rw-r--r-- | indra/media_plugins/libvlc/media_plugin_libvlc.cpp | 5 |
4 files changed, 102 insertions, 97 deletions
diff --git a/autobuild.xml b/autobuild.xml index 08233ef403..c3d7c03121 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -76,9 +76,9 @@ <key>archive</key> <map> <key>hash</key> - <string>9b8bcc3be6dbe40a04c9c81c313f70dc</string> + <string>f3f49349055a525369a73139046a55a1</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/68333/658209/apr_suite-1.4.5.548882-darwin64-548882.tar.bz2</string> + <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/76345/727286/apr_suite-1.4.5.555520-darwin64-555520.tar.bz2</string> </map> <key>name</key> <string>darwin64</string> @@ -112,9 +112,9 @@ <key>archive</key> <map> <key>hash</key> - <string>6bdf460c18ee004b41a46afc80041a92</string> + <string>0628a381c80cae621106e41a0b592bcd</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/68334/658225/apr_suite-1.4.5.548882-windows-548882.tar.bz2</string> + <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/76347/727295/apr_suite-1.4.5.555520-windows-555520.tar.bz2</string> </map> <key>name</key> <string>windows</string> @@ -124,16 +124,16 @@ <key>archive</key> <map> <key>hash</key> - <string>83104bfa4dabb77cd70d185e38a95b49</string> + <string>79fdb06371d6aeb29b52d593b2865f57</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/68332/658215/apr_suite-1.4.5.548882-windows64-548882.tar.bz2</string> + <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/76346/727296/apr_suite-1.4.5.555520-windows64-555520.tar.bz2</string> </map> <key>name</key> <string>windows64</string> </map> </map> <key>version</key> - <string>1.4.5.548882</string> + <string>1.4.5.555520</string> </map> <key>boost</key> <map> @@ -166,9 +166,9 @@ <key>archive</key> <map> <key>hash</key> - <string>3cc73623c9a976b4f8346a3837f7a916</string> + <string>3c0e9cfeb2a1c099a068aa999a54a1ce</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/64088/601256/boost-1.72-darwin64-545361.tar.bz2</string> + <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/77456/734789/boost-1.72-darwin64-556301.tar.bz2</string> </map> <key>name</key> <string>darwin64</string> @@ -202,9 +202,9 @@ <key>archive</key> <map> <key>hash</key> - <string>7d4b2511976449e9a4ec7be41dc8310f</string> + <string>2f5b314539617871e9d104f1f83f0ccd</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/64092/601270/boost-1.72-windows-545361.tar.bz2</string> + <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/77458/734770/boost-1.72-windows-556301.tar.bz2</string> </map> <key>name</key> <string>windows</string> @@ -214,9 +214,9 @@ <key>archive</key> <map> <key>hash</key> - <string>4ad8df0700745201cddf6b71d7b0949f</string> + <string>e8cdfffa30c85229befb0c901fedb7e3</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/64091/601265/boost-1.72-windows64-545361.tar.bz2</string> + <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/77459/734776/boost-1.72-windows64-556301.tar.bz2</string> </map> <key>name</key> <string>windows64</string> @@ -308,9 +308,9 @@ <key>archive</key> <map> <key>hash</key> - <string>02e6a8207dcdaf243dcb6da19b8c3534</string> + <string>3250ad7a5e12e8656b0aa4701b38ad3a</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/64099/601302/colladadom-2.3.545362-darwin64-545362.tar.bz2</string> + <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/77469/734822/colladadom-2.3.556305-darwin64-556305.tar.bz2</string> </map> <key>name</key> <string>darwin64</string> @@ -344,9 +344,9 @@ <key>archive</key> <map> <key>hash</key> - <string>8a02a10fc69c8f504dc5335644db184a</string> + <string>20b8a8395bbd8e86f48c75bf8fc2e642</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/64104/601313/colladadom-2.3.545362-windows-545362.tar.bz2</string> + <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/77468/734828/colladadom-2.3.556305-windows-556305.tar.bz2</string> </map> <key>name</key> <string>windows</string> @@ -356,16 +356,16 @@ <key>archive</key> <map> <key>hash</key> - <string>742180324fca7ab92b6a61a36aab4f9d</string> + <string>bc88fdd32fd7d005c7dfc58c82260a29</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/64103/601314/colladadom-2.3.545362-windows64-545362.tar.bz2</string> + <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/77470/734834/colladadom-2.3.556305-windows64-556305.tar.bz2</string> </map> <key>name</key> <string>windows64</string> </map> </map> <key>version</key> - <string>2.3.545362</string> + <string>2.3.556305</string> </map> <key>curl</key> <map> @@ -398,9 +398,9 @@ <key>archive</key> <map> <key>hash</key> - <string>f5ae57117a6518d11f49ccfbfbe0969d</string> + <string>d4c8b00a88e879bd1a7e6805af2ccb1c</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/64131/601402/curl-7.54.1.545369-darwin64-545369.tar.bz2</string> + <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/76361/727381/curl-7.54.1.555526-darwin64-555526.tar.bz2</string> </map> <key>name</key> <string>darwin64</string> @@ -434,11 +434,11 @@ <key>archive</key> <map> <key>hash</key> - <string>2796ae7b09e730a55ac03f74ed669520</string> + <string>0bca1f79fc78b0045de18f69fea03093</string> <key>hash_algorithm</key> <string>md5</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/64130/601396/curl-7.54.1.545369-windows-545369.tar.bz2</string> + <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/76362/727375/curl-7.54.1.555526-windows-555526.tar.bz2</string> </map> <key>name</key> <string>windows</string> @@ -448,16 +448,16 @@ <key>archive</key> <map> <key>hash</key> - <string>a8f96e5cdb8128b23d49ff4c3f2233a4</string> + <string>cca8ff1d59fcfc64e99c79a950f3abc1</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/64129/601382/curl-7.54.1.545369-windows64-545369.tar.bz2</string> + <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/76360/727374/curl-7.54.1.555526-windows64-555526.tar.bz2</string> </map> <key>name</key> <string>windows64</string> </map> </map> <key>version</key> - <string>7.54.1.545369</string> + <string>7.54.1.555526</string> </map> <key>db</key> <map> @@ -580,9 +580,9 @@ <key>archive</key> <map> <key>hash</key> - <string>cc26af2ebfa241891caca829a6e46b88</string> + <string>46124156a4148d61c849d328c8659f78</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/65005/607316/dullahan-1.7.0.202008031101_81.3.10_gb223419_chromium-81.0.4044.138-darwin64-546064.tar.bz2</string> + <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/76900/730915/dullahan-1.7.0.202102101914_81.3.10_gb223419_chromium-81.0.4044.138-darwin64-555904.tar.bz2</string> </map> <key>name</key> <string>darwin64</string> @@ -592,9 +592,9 @@ <key>archive</key> <map> <key>hash</key> - <string>4e5b9e2fe65d94e30a4f3d831c767199</string> + <string>d801e6c21333c94a7a04177aa91d5c1c</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/65004/607304/dullahan-1.7.0.202008031759_81.3.10_gb223419_chromium-81.0.4044.138-windows-546064.tar.bz2</string> + <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/76901/730924/dullahan-1.7.0.202102101918_81.3.10_gb223419_chromium-81.0.4044.138-windows-555904.tar.bz2</string> </map> <key>name</key> <string>windows</string> @@ -604,16 +604,16 @@ <key>archive</key> <map> <key>hash</key> - <string>6f7bf7f915f3d75dbdad08a2d41ca74e</string> + <string>dde4748dca0a75c6af30eca584e43352</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/65003/607308/dullahan-1.7.0.202008031800_81.3.10_gb223419_chromium-81.0.4044.138-windows64-546064.tar.bz2</string> + <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/76902/730930/dullahan-1.7.0.202102101918_81.3.10_gb223419_chromium-81.0.4044.138-windows64-555904.tar.bz2</string> </map> <key>name</key> <string>windows64</string> </map> </map> <key>version</key> - <string>1.7.0.202008031800_81.3.10_gb223419_chromium-81.0.4044.138</string> + <string>1.7.0.202102101918_81.3.10_gb223419_chromium-81.0.4044.138</string> </map> <key>elfio</key> <map> @@ -670,9 +670,9 @@ <key>archive</key> <map> <key>hash</key> - <string>3656b7f7b655cb267fd94f089d2e145c</string> + <string>f4e80e0dfcab713a3da90cd8f7f23e7b</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/54860/510198/expat-2.1.1.538990-darwin64-538990.tar.bz2</string> + <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/76341/727265/expat-2.1.1.555519-darwin64-555519.tar.bz2</string> </map> <key>name</key> <string>darwin64</string> @@ -706,9 +706,9 @@ <key>archive</key> <map> <key>hash</key> - <string>c509f8afa1e02f4c16232cce7f6855f8</string> + <string>cd4fe03473076c324d80ae3bd91a85bb</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/55056/512080/expat-2.1.1.538990-windows-538990.tar.bz2</string> + <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/76343/727273/expat-2.1.1.555519-windows-555519.tar.bz2</string> </map> <key>name</key> <string>windows</string> @@ -718,16 +718,16 @@ <key>archive</key> <map> <key>hash</key> - <string>aba97cfdf44c04dbfcac89c7cb472580</string> + <string>d2d74d73b914150982b1883a3b96e60b</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/55054/512068/expat-2.1.1.538990-windows64-538990.tar.bz2</string> + <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/76344/727279/expat-2.1.1.555519-windows64-555519.tar.bz2</string> </map> <key>name</key> <string>windows64</string> </map> </map> <key>version</key> - <string>2.1.1.538990</string> + <string>2.1.1.555519</string> </map> <key>fmodstudio</key> <map> @@ -748,9 +748,9 @@ <key>archive</key> <map> <key>hash</key> - <string>89c37441a806ed80c0102d380eec6fd0</string> + <string>d5528538e67c710387ae0c061a90cb23</string> <key>url</key> - <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/65400/612632/fmodstudio-2.00.11.546392-darwin64-546392.tar.bz2</string> + <string>https://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/76868/730756/fmodstudio-2.01.07.555883-darwin64-555883.tar.bz2</string> </map> <key>name</key> <string>darwin64</string> @@ -784,9 +784,9 @@ <key>archive</key> <map> <key>hash</key> - <string>0f44323b0d03b7d0d8a17eec83e103ce</string> + <string>a2bb6eaf51f933993b26a5fe7503a761</string> <key>url</key> - <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/65401/612647/fmodstudio-2.00.11.546392-windows-546392.tar.bz2</string> + <string>https://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/76869/730763/fmodstudio-2.01.07.555883-windows-555883.tar.bz2</string> </map> <key>name</key> <string>windows</string> @@ -796,16 +796,16 @@ <key>archive</key> <map> <key>hash</key> - <string>462d28eacf731a5d36ab031e7071c32a</string> + <string>138d07dd516a9ad5b9787192fe6134dd</string> <key>url</key> - <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/65402/612648/fmodstudio-2.00.11.546392-windows64-546392.tar.bz2</string> + <string>https://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/76867/730751/fmodstudio-2.01.07.555883-windows64-555883.tar.bz2</string> </map> <key>name</key> <string>windows64</string> </map> </map> <key>version</key> - <string>2.00.11.546392</string> + <string>2.01.07.555883</string> </map> <key>fontconfig</key> <map> @@ -1078,9 +1078,9 @@ <key>archive</key> <map> <key>hash</key> - <string>343913fe1434da228c2210c23d2e3a1a</string> + <string>a9eaa005ff9d387f946283fbcb69b3c8</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/54850/510134/glod-1.0pre3.538980-darwin64-538980.tar.bz2</string> + <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/76353/727324/glod-1.0pre3.555522-darwin64-555522.tar.bz2</string> </map> <key>name</key> <string>darwin64</string> @@ -1139,7 +1139,7 @@ </map> </map> <key>version</key> - <string>1.0pre3.538980</string> + <string>1.0pre3.555522</string> </map> <key>google_breakpad</key> <map> @@ -1262,9 +1262,9 @@ <key>archive</key> <map> <key>hash</key> - <string>f9831360ced94943ab9dfb3fbf5256d3</string> + <string>e280519baadf8369b4d7d1cd00506b49</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/64101/601290/googlemock-1.7.0.545363-darwin64-545363.tar.bz2</string> + <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/77465/734807/googlemock-1.7.0.556304-darwin64-556304.tar.bz2</string> </map> <key>name</key> <string>darwin64</string> @@ -1298,9 +1298,9 @@ <key>archive</key> <map> <key>hash</key> - <string>8149e46b4f7abb3ac284415cfe1366e1</string> + <string>d4d5b681cb2d0a214bba2ad54a36dea9</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/64102/601296/googlemock-1.7.0.545363-windows-545363.tar.bz2</string> + <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/77466/734805/googlemock-1.7.0.556304-windows-556304.tar.bz2</string> </map> <key>name</key> <string>windows</string> @@ -1310,16 +1310,16 @@ <key>archive</key> <map> <key>hash</key> - <string>f3851eba809ead2810d702041569d36d</string> + <string>5dfc8cc3160a6954757cebdeaaa30376</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/64100/601284/googlemock-1.7.0.545363-windows64-545363.tar.bz2</string> + <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/77467/734815/googlemock-1.7.0.556304-windows64-556304.tar.bz2</string> </map> <key>name</key> <string>windows64</string> </map> </map> <key>version</key> - <string>1.7.0.545363</string> + <string>1.7.0.556304</string> </map> <key>gstreamer</key> <map> @@ -1792,9 +1792,9 @@ <key>archive</key> <map> <key>hash</key> - <string>c327e6d6573fc0a808677de47f08acd9</string> + <string>2021ea3a19b81c82993e733709683303</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/54844/510092/libhunspell-1.3.2.538974-darwin64-538974.tar.bz2</string> + <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/76371/727419/libhunspell-1.3.2.555528-darwin64-555528.tar.bz2</string> </map> <key>name</key> <string>darwin64</string> @@ -1828,9 +1828,9 @@ <key>archive</key> <map> <key>hash</key> - <string>ec22ec25160bcfd2a74f1c7bc8ff6133</string> + <string>2253ec09136cc7c208481030d78d9dd7</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/54986/511824/libhunspell-1.3.2.538974-windows-538974.tar.bz2</string> + <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/76369/727412/libhunspell-1.3.2.555528-windows-555528.tar.bz2</string> </map> <key>name</key> <string>windows</string> @@ -1840,16 +1840,16 @@ <key>archive</key> <map> <key>hash</key> - <string>f470c6f3f7b0559e95e76467b808de10</string> + <string>858d1708f6b3a74738a3d57a5387e20f</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/54985/511817/libhunspell-1.3.2.538974-windows64-538974.tar.bz2</string> + <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/76370/727413/libhunspell-1.3.2.555528-windows64-555528.tar.bz2</string> </map> <key>name</key> <string>windows64</string> </map> </map> <key>version</key> - <string>1.3.2.538974</string> + <string>1.3.2.555528</string> </map> <key>libndofdev</key> <map> @@ -1882,9 +1882,9 @@ <key>archive</key> <map> <key>hash</key> - <string>bf765dfe0b928ef3c531cd9618fee89b</string> + <string>a487fff84208a45844602c4a1f68c974</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/54843/510085/libndofdev-0.1.538973-darwin64-538973.tar.bz2</string> + <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/76356/727333/libndofdev-0.1.555523-darwin64-555523.tar.bz2</string> </map> <key>name</key> <string>darwin64</string> @@ -1894,9 +1894,9 @@ <key>archive</key> <map> <key>hash</key> - <string>8abb7d216535009f6c0a7e43b0734b1e</string> + <string>4c839555bf0ed9ae60ffc3f8a7c96f9b</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/54984/511810/libndofdev-0.1.538973-windows-538973.tar.bz2</string> + <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/76354/727340/libndofdev-0.1.555523-windows-555523.tar.bz2</string> </map> <key>name</key> <string>windows</string> @@ -1906,16 +1906,16 @@ <key>archive</key> <map> <key>hash</key> - <string>9da7aed5a914174dcb2be12ecd4a656f</string> + <string>cbc033ae3b034b992b59f6de1034247c</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/54983/511803/libndofdev-0.1.538973-windows64-538973.tar.bz2</string> + <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/76355/727341/libndofdev-0.1.555523-windows64-555523.tar.bz2</string> </map> <key>name</key> <string>windows64</string> </map> </map> <key>version</key> - <string>0.1.538973</string> + <string>0.1.555523</string> </map> <key>libpng</key> <map> @@ -2414,9 +2414,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>archive</key> <map> <key>hash</key> - <string>937ce1a2158c0cfff37f5989f5b24aba</string> + <string>e4f784d8a035c51921a1562ca7a1bab6</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/64066/601156/nghttp2-1.40.0.545354-darwin64-545354.tar.bz2</string> + <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/76357/727350/nghttp2-1.40.0.555524-darwin64-555524.tar.bz2</string> </map> <key>name</key> <string>darwin64</string> @@ -2450,9 +2450,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>archive</key> <map> <key>hash</key> - <string>138b881bdf37dff4e626e022a50dd11f</string> + <string>af05aa2994c9845308fecd094b7b2d25</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/64069/601181/nghttp2-1.40.0.545354-windows-545354.tar.bz2</string> + <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/76359/727360/nghttp2-1.40.0.555524-windows-555524.tar.bz2</string> </map> <key>name</key> <string>windows</string> @@ -2462,9 +2462,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>archive</key> <map> <key>hash</key> - <string>c23c6480c7cbea60a2bd26e257adc0a7</string> + <string>5a55cede40eef16b9d1e47c418a2b77a</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/64068/601177/nghttp2-1.40.0.545354-windows64-545354.tar.bz2</string> + <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/76358/727359/nghttp2-1.40.0.555524-windows64-555524.tar.bz2</string> </map> <key>name</key> <string>windows64</string> @@ -2473,7 +2473,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>source_type</key> <string>hg</string> <key>version</key> - <string>1.40.0.545354</string> + <string>1.40.0.555524</string> </map> <key>nvapi</key> <map> @@ -3262,9 +3262,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>archive</key> <map> <key>hash</key> - <string>5e553a4358203f283c74744aed2fcd8c</string> + <string>b639d0035f4a8c9b4973be428a1b7e61</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/54836/510036/vlc_bin-2.2.8.538966-darwin64-538966.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/69569/671323/vlc_bin-3.0.9.549888-darwin64-549888.tar.bz2</string> </map> <key>name</key> <string>darwin64</string> @@ -3286,9 +3286,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>archive</key> <map> <key>hash</key> - <string>ca84b7c5f86e702fb35727eed8f0c8c4</string> + <string>4f50b0c47daa081dd4fcb83763d5b0b2</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/54958/511725/vlc_bin-2.2.8.538966-windows-538966.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/69567/671314/vlc_bin-3.0.9.549888-windows-549888.tar.bz2</string> </map> <key>name</key> <string>windows</string> @@ -3298,16 +3298,16 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>archive</key> <map> <key>hash</key> - <string>93cd88d90cb8aedbed5cd90ff9262409</string> + <string>c2f8c01fb6c261b72beb07f0c4cd423f</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/54954/511718/vlc_bin-2.2.8.538966-windows64-538966.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/69568/671315/vlc_bin-3.0.9.549888-windows64-549888.tar.bz2</string> </map> <key>name</key> <string>windows64</string> </map> </map> <key>version</key> - <string>2.2.8.538966</string> + <string>3.0.9.549888</string> </map> <key>xmlrpc-epi</key> <map> @@ -3340,9 +3340,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>archive</key> <map> <key>hash</key> - <string>99ea1808ee9f5b55029daa9fdef86776</string> + <string>922a0dea32266897ed1911200438e1e1</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/55063/512104/xmlrpc_epi-0.54.1.539072-darwin64-539072.tar.bz2</string> + <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/76372/727426/xmlrpc_epi-0.54.1.555529-darwin64-555529.tar.bz2</string> </map> <key>name</key> <string>darwin64</string> @@ -3376,9 +3376,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>archive</key> <map> <key>hash</key> - <string>94643b7cebb449f049fa9e32ae682bcd</string> + <string>34b847e6b280048465fe7c6ce67fe05c</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/55138/512288/xmlrpc_epi-0.54.1.539072-windows-539072.tar.bz2</string> + <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/76374/727436/xmlrpc_epi-0.54.1.555529-windows-555529.tar.bz2</string> </map> <key>name</key> <string>windows</string> @@ -3388,16 +3388,16 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>archive</key> <map> <key>hash</key> - <string>c409de1974a879291ce7daaf52348d85</string> + <string>8fbe7c4ea22bb7f23a93c73884ebb34c</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/55137/512279/xmlrpc_epi-0.54.1.539072-windows64-539072.tar.bz2</string> + <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/76373/727435/xmlrpc_epi-0.54.1.555529-windows64-555529.tar.bz2</string> </map> <key>name</key> <string>windows64</string> </map> </map> <key>version</key> - <string>0.54.1.539072</string> + <string>0.54.1.555529</string> </map> <key>zlib</key> <map> diff --git a/indra/llcommon/llsingleton.cpp b/indra/llcommon/llsingleton.cpp index 83a4b64e8f..ad933154c2 100644 --- a/indra/llcommon/llsingleton.cpp +++ b/indra/llcommon/llsingleton.cpp @@ -388,7 +388,7 @@ LLSingletonBase::vec_t LLSingletonBase::dep_sort() // extracts just the first (key) element from each sorted_iterator, then // uses vec_t's range constructor... but frankly this is more // straightforward, as long as we remember the above reserve() call! - for (const SingletonDeps::sorted_iterator::value_type& pair : sdeps.sort()) + for (const SingletonDeps::sorted_iterator::value_type pair : sdeps.sort()) { ret.push_back(pair.first); } diff --git a/indra/llplugin/llpluginprocessparent.cpp b/indra/llplugin/llpluginprocessparent.cpp index 7d18bae947..e5b4dec1bd 100644 --- a/indra/llplugin/llpluginprocessparent.cpp +++ b/indra/llplugin/llpluginprocessparent.cpp @@ -154,9 +154,9 @@ void LLPluginProcessParent::shutdown() { EState state = (*it).second->mState; if (state != STATE_CLEANUP - || state != STATE_EXITING - || state != STATE_DONE - || state != STATE_ERROR) + && state != STATE_EXITING + && state != STATE_DONE + && state != STATE_ERROR) { (*it).second->setState(STATE_GOODBYE); } diff --git a/indra/media_plugins/libvlc/media_plugin_libvlc.cpp b/indra/media_plugins/libvlc/media_plugin_libvlc.cpp index f7d35b33c2..5d4a488e64 100644 --- a/indra/media_plugins/libvlc/media_plugin_libvlc.cpp +++ b/indra/media_plugins/libvlc/media_plugin_libvlc.cpp @@ -34,6 +34,11 @@ #include "llpluginmessageclasses.h" #include "media_plugin_base.h" +#if defined(_MSC_VER) +#include <basetsd.h> +typedef SSIZE_T ssize_t; +#endif + #include "vlc/vlc.h" #include "vlc/libvlc_version.h" |