summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2023-01-31 18:48:16 +0200
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2023-01-31 19:17:34 +0200
commit851815442625f0378cb21ffdb8dd588122087e18 (patch)
tree08d3e3fbac05b1c7f05d707e21681653d15f993f
parent9438ef5f79fdac11080c3fa10c518e335fd7d8d6 (diff)
SL-19110 Fix xxhash build link and properly register contribution
-rw-r--r--autobuild.xml4
-rwxr-xr-xdoc/contributions.txt1
-rw-r--r--indra/llcommon/hbxxh.cpp2
3 files changed, 4 insertions, 3 deletions
diff --git a/autobuild.xml b/autobuild.xml
index 8e83419a9a..d4d5e08bcb 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -2835,9 +2835,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 e0c6e9cf7e..c6c7ea8f53 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -585,6 +585,7 @@ Henri Beauchamp
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 e94581d415..a2c09ff929 100644
--- a/indra/llcommon/hbxxh.cpp
+++ b/indra/llcommon/hbxxh.cpp
@@ -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"