summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2017-09-29 08:46:44 -0400
committerNat Goodspeed <nat@lindenlab.com>2017-09-29 08:46:44 -0400
commitee2a1902a59f41326bea2dccb79f920640cad7c0 (patch)
tree4856e7885b8d7874d16ff40a7b65dc9682daf7c9 /indra
parenta05214da35863dd5f0fd8ea47c494190b1c10656 (diff)
MAINT-7081: Mention nghttp2.dll where it must be mentioned.
Diffstat (limited to 'indra')
-rw-r--r--indra/cmake/Copy3rdPartyLibs.cmake1
-rwxr-xr-xindra/newview/viewer_manifest.py3
2 files changed, 4 insertions, 0 deletions
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index cb7432ce4c..bd55fc39c0 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -37,6 +37,7 @@ if(WINDOWS)
libapriconv-1.dll
ssleay32.dll
libeay32.dll
+ nghttp2.dll
glod.dll
libhunspell.dll
)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 29c9337cc1..ecff21e6d2 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -454,6 +454,9 @@ class WindowsManifest(ViewerManifest):
self.path("ssleay32.dll")
self.path("libeay32.dll")
+ # HTTP/2
+ self.path("nghttp2.dll")
+
# Hunspell
self.path("libhunspell.dll")