diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-08-23 22:40:17 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-08-23 22:40:17 +0300 |
| commit | 3d73a10da3e051b232b4ddc89c1463a8b097ca7f (patch) | |
| tree | 8b32d955d0628ca1138301177e1413cc419229fd /autobuild.xml | |
| parent | 4b5b048cb6280cbd9fd303acd96fce73461d1fb4 (diff) | |
| parent | d454512050e636a19e4b7545515dea4f4b1bbf0d (diff) | |
Merge branch main (DRTVWR-582) into DRTVWR-567
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventoryfunctions.h
# indra/newview/llinventorymodel.cpp
# indra/newview/llinventoryobserver.cpp
# indra/newview/llinventoryobserver.h
# indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
Diffstat (limited to 'autobuild.xml')
| -rw-r--r-- | autobuild.xml | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/autobuild.xml b/autobuild.xml index b1cfe79275..9785884a40 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1,5 +1,6 @@ <?xml version="1.0" ?> -<llsd><map> +<llsd> +<map> <key>installables</key> <map> <key>SDL</key> @@ -2700,9 +2701,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>archive</key> <map> <key>hash</key> - <string>9e1b5515ab59b4e9cfeef6626d65d03d</string> + <string>8b091b1f13348eedadf66d7d81cb6bc1</string> <key>url</key> - <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/108609/945996/viewer_manager-3.0.577252-darwin64-577252.tar.bz2</string> + <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/116621/1003286/viewer_manager-3.0.580913-darwin64-580913.tar.bz2</string> </map> <key>name</key> <string>darwin64</string> @@ -2712,9 +2713,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>archive</key> <map> <key>hash</key> - <string>a3c599595ecc8fb987a5499fca42520a</string> + <string>647e86470e02509b1cf89829d08dfd46</string> <key>url</key> - <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/108610/946003/viewer_manager-3.0.577252-windows-577252.tar.bz2</string> + <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/116623/1003293/viewer_manager-3.0.580913-windows-580913.tar.bz2</string> </map> <key>name</key> <string>windows</string> @@ -2725,7 +2726,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>source_type</key> <string>hg</string> <key>version</key> - <string>3.0.577252</string> + <string>3.0.580913</string> </map> <key>vlc-bin</key> <map> @@ -3290,7 +3291,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <string>/t:Build</string> <string>/p:useenv=true</string> <string>/verbosity:minimal</string> - <string>/toolsversion:4.0</string> <string>/p:VCBuildAdditionalOptions= /incremental</string> </array> </map> @@ -3364,7 +3364,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <string>/t:Build</string> <string>/p:useenv=true</string> <string>/verbosity:minimal</string> - <string>/toolsversion:4.0</string> <string>/p:VCBuildAdditionalOptions= /incremental</string> </array> </map> @@ -3401,4 +3400,5 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <string>autobuild</string> <key>version</key> <string>1.3</string> - </map></llsd> + </map> +</llsd> |