diff options
| author | Callum Prentice <callum@gmail.com> | 2020-05-04 10:53:11 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@gmail.com> | 2020-05-04 10:53:11 -0700 |
| commit | 691a2d996cb364201d8e73378eab0d3d09eddb08 (patch) | |
| tree | 49c26bb103d30daf398e57c51a424639d80f5b03 /indra/llui/tests | |
| parent | 77d2a05921bdba3ac284350650c5394dcc8e3444 (diff) | |
| parent | 4a7fd0117a43dca9e30c58c6417ebdf6862561f6 (diff) | |
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-512
Diffstat (limited to 'indra/llui/tests')
| -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 // { |