diff options
| author | Richard Linden <none@none> | 2013-06-05 19:05:43 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-06-05 19:05:43 -0700 |
| commit | 0a96b47663c99914c587cdcb8bcdc096bbf55fa3 (patch) | |
| tree | 67bca4958927ed7f6df423de05e42cd271292391 /indra/newview/llxmlrpctransaction.cpp | |
| parent | dcfb18373eca7986a73d8b9a1d34970cc0a23ed9 (diff) | |
| parent | a74b5dfa923f8eeccc9b786143f0f832de3ad450 (diff) | |
merge with viewer-release
Diffstat (limited to 'indra/newview/llxmlrpctransaction.cpp')
| -rwxr-xr-x | indra/newview/llxmlrpctransaction.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llxmlrpctransaction.cpp b/indra/newview/llxmlrpctransaction.cpp index 0da70d398b..583196fb7a 100755 --- a/indra/newview/llxmlrpctransaction.cpp +++ b/indra/newview/llxmlrpctransaction.cpp @@ -25,6 +25,8 @@ */ #include "llviewerprecompiledheaders.h" +// include this to get winsock2 because openssl attempts to include winsock1 +#include "llwin32headerslean.h" #include <openssl/x509_vfy.h> #include <openssl/ssl.h> #include "llsecapi.h" |