diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-01-15 23:58:06 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-01-16 01:06:16 +0200 |
| commit | 3d525fbf18568659722e6c4e4d93d96e2624498f (patch) | |
| tree | 97b34f0dd42bc1fb8364799904708401329b5cfb | |
| parent | f86014ef151c7af64de4a08dc4c320e1743fb34b (diff) | |
SL-14597 Pulled in updated uriparser
Due to crash inside uriparser's code
| -rw-r--r-- | autobuild.xml | 14 | ||||
| -rw-r--r-- | indra/cmake/Copy3rdPartyLibs.cmake | 2 | ||||
| -rw-r--r-- | indra/newview/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 4 |
4 files changed, 15 insertions, 7 deletions
diff --git a/autobuild.xml b/autobuild.xml index 28fac4befe..a88d168f8f 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3128,9 +3128,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>archive</key> <map> <key>hash</key> - <string>d463360491b6b5cb7a57cd67a90ececb</string> + <string>e9c36803b32f1750490e159b58cc217c</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/54838/510050/uriparser-0.8.0.1-darwin64-538968.tar.bz2</string> + <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/75707/723304/uriparser-0.9.4-darwin64-555093.tar.bz2</string> </map> <key>name</key> <string>darwin64</string> @@ -3164,9 +3164,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>archive</key> <map> <key>hash</key> - <string>57a88be57694de6cf9f516125af2c4c9</string> + <string>aa90a3cf93cc7675bb8177b218de743e</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/54963/511746/uriparser-0.8.0.1-windows-538968.tar.bz2</string> + <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/75708/723315/uriparser-0.9.4-windows-555093.tar.bz2</string> </map> <key>name</key> <string>windows</string> @@ -3176,16 +3176,16 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>archive</key> <map> <key>hash</key> - <string>f39cc91f2a5dad13790ec18269844ae4</string> + <string>223077dd896ae94f212db3a163b7442d</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/54962/511739/uriparser-0.8.0.1-windows64-538968.tar.bz2</string> + <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/75709/723316/uriparser-0.9.4-windows64-555093.tar.bz2</string> </map> <key>name</key> <string>windows64</string> </map> </map> <key>version</key> - <string>0.8.0.1</string> + <string>0.9.4</string> </map> <key>viewer-manager</key> <map> diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 8efad33f71..578120f703 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -61,6 +61,7 @@ if(WINDOWS) nghttp2.dll glod.dll libhunspell.dll + uriparser.dll ) # Filenames are different for 32/64 bit BugSplat file and we don't @@ -165,6 +166,7 @@ elseif(DARWIN) libnghttp2.dylib libnghttp2.14.dylib libnghttp2.14.19.0.dylib + liburiparser.dylib ) if (FMODSTUDIO) diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 95d54de7d8..85ba991ef0 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1814,6 +1814,8 @@ if (WINDOWS) ${SHARED_LIB_STAGING_DIR}/Release/libhunspell.dll ${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/libhunspell.dll ${SHARED_LIB_STAGING_DIR}/Debug/libhunspell.dll + ${SHARED_LIB_STAGING_DIR}/Release/uriparser.dll + ${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/uriparser.dll ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/SLVoice.exe ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/libsndfile-1.dll ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/vivoxoal.dll diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 90a2af98f7..bc121c92ac 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -531,6 +531,9 @@ class WindowsManifest(ViewerManifest): # For textures self.path("openjpeg.dll") + # Uriparser + self.path("uriparser.dll") + # These need to be installed as a SxS assembly, currently a 'private' assembly. # See http://msdn.microsoft.com/en-us/library/ms235291(VS.80).aspx self.path("msvcp140.dll") @@ -1033,6 +1036,7 @@ class DarwinManifest(ViewerManifest): # libnghttp2.major.dylib, which is a symlink to # libnghttp2.version.dylib. Get all of them. "libnghttp2.*dylib", + "liburiparser.dylib", ): dylibs += path_optional(os.path.join(relpkgdir, libfile), libfile) |