diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-05-05 01:40:40 +0300 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-05-05 01:40:40 +0300 |
commit | 30234c508b4ef8921359371de7ef79546aea5626 (patch) | |
tree | 07286f53e369104e80ea008c2c767b9dfbed147d /indra/llui | |
parent | 59433e3132b057003afcc1ba230ff16ffe62f92c (diff) | |
parent | 4a7fd0117a43dca9e30c58c6417ebdf6862561f6 (diff) |
Merge branch 'master' into DRTVWR-507-maint
Diffstat (limited to 'indra/llui')
-rw-r--r-- | indra/llui/tests/llurlentry_test.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llui/tests/llurlentry_test.cpp b/indra/llui/tests/llurlentry_test.cpp index 119cbebc81..3c34fd269e 100644 --- a/indra/llui/tests/llurlentry_test.cpp +++ b/indra/llui/tests/llurlentry_test.cpp @@ -36,6 +36,11 @@ #include <boost/regex.hpp> +#if LL_WINDOWS +// because something pulls in window and lldxdiag dependencies which in turn need wbemuuid.lib + #pragma comment(lib, "wbemuuid.lib") +#endif + // namespace LLExperienceCache // { |