diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-08-24 01:23:52 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-08-24 01:23:52 +0300 |
| commit | 7373fd91fa42b3fce0804ccd10899a5d1fdb5c36 (patch) | |
| tree | 54a107f3415c04e6e493f54e156c3ac278d36f99 /autobuild.xml | |
| parent | 264d9c32d9e04df0ceeaf2a63f6872aad29dd46a (diff) | |
| parent | d454512050e636a19e4b7545515dea4f4b1bbf0d (diff) | |
Merge remote-tracking branch 'origin/main' into DRTVWR-489
# Conflicts:
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/llmath/llvolume.cpp
# indra/llrender/llgl.cpp
# indra/llxml/llcontrol.cpp
# indra/newview/llpanelnearbymedia.cpp
# indra/newview/llsceneview.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/llstartup.cpp
# indra/newview/lltextureview.cpp
# indra/newview/llvovolume.cpp
# indra/newview/skins/default/xui/en/menu_viewer.xml
Diffstat (limited to 'autobuild.xml')
| -rw-r--r-- | autobuild.xml | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/autobuild.xml b/autobuild.xml index 899ef96297..bed4d58443 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -2923,9 +2923,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> @@ -2935,9 +2935,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> @@ -2948,7 +2948,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> @@ -3513,7 +3513,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> @@ -3587,7 +3586,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> |