diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-05-04 19:34:48 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-05-04 19:34:48 +0300 |
| commit | 13f501b3331f352e003053cac14ed285f12b1f10 (patch) | |
| tree | 81743feb09f27835a130c8c79812acdcfe27ab25 /indra/llui | |
| parent | 2bddce7cabd525853e59c442223ab88996432d7a (diff) | |
| parent | 4a7fd0117a43dca9e30c58c6417ebdf6862561f6 (diff) | |
Merged master into DRTVWR-508
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 // { |