diff --git a/autobuild.xml b/autobuild.xml index 67c9b84af2a5f62408a7298554ff5beef40a985c..916a2d06e853e81d49cb2a24b367f328ad9932ed 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -2947,9 +2947,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>archive</key> <map> <key>hash</key> - <string>f54f21dda4ce25b112f0cc7b4ce38bba</string> + <string>e4f77ba0a9b8ec3cc3fabc51c4da81d2</string> <key>url</key> - <string>http://sldev.free.fr/libraries/xxhash-0.8.1-20230124.tar.bz2</string> + <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/110070/956941/xxhash-0.8.1.578006-windows-578006.tar.bz2</string> </map> <key>name</key> <string>common</string> diff --git a/doc/contributions.txt b/doc/contributions.txt index 4cabb84b1034af760667cf16d4f0d9384e2edc93..4975039241a0a2566589ba65a17b0943ab51d0d1 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -582,6 +582,8 @@ Henri Beauchamp VWR-1320 VWR-1406 VWR-4157 + SL-15175 + SL-19110 herina Bode Hikkoshi Sakai VWR-429 diff --git a/indra/llcommon/hbxxh.cpp b/indra/llcommon/hbxxh.cpp index e94581d4153e941634e18ac4228535b8f35d7804..388269d6c8e5d107783241a229318ba10b0bc10e 100644 --- a/indra/llcommon/hbxxh.cpp +++ b/indra/llcommon/hbxxh.cpp @@ -2,7 +2,7 @@ * @file hbxxh.cpp * @brief High performances vectorized hashing based on xxHash. * - * $LicenseInfo:firstyear=2023&license=viewergpl$ + * $LicenseInfo:firstyear=2023&license=viewerlgpl$ * Second Life Viewer Source Code * Copyright (c) 2023, Henri Beauchamp. * @@ -34,7 +34,7 @@ // in your build, in which case the latter would be used instead. For ARM64 // builds, this would also automatically enable NEON vectorization. #define XXH_INLINE_ALL -#include "xxhash.h" +#include "xxhash/xxhash.h" #include "hbxxh.h" diff --git a/indra/llcommon/hbxxh.h b/indra/llcommon/hbxxh.h index 8a5f977648e9b2d70edcef3c22fb5e7467219df7..236716722ad0643ce8e617b19ddfe6a8a4a2f087 100644 --- a/indra/llcommon/hbxxh.h +++ b/indra/llcommon/hbxxh.h @@ -2,7 +2,7 @@ * @file hbxxh.h * @brief High performances vectorized hashing based on xxHash. * - * $LicenseInfo:firstyear=2023&license=viewergpl$ + * $LicenseInfo:firstyear=2023&license=viewerlgpl$ * Second Life Viewer Source Code * Copyright (c) 2023, Henri Beauchamp. *