summaryrefslogtreecommitdiff
path: root/indra/llmessage
diff options
context:
space:
mode:
authorCallum Prentice <callum@lindenlab.com>2021-06-07 18:55:00 -0700
committerCallum Prentice <callum@lindenlab.com>2021-06-07 18:55:00 -0700
commitad9ed0a94dfd37878b35b70e0a365017a1e548bf (patch)
treea86bee1eba9cd8c40c1408abf067e3f8f673a33f /indra/llmessage
parentac8640d338997020ca0650001ff004e1103ac5cb (diff)
parent4623b822386accfae5907c88099c2a88377a0271 (diff)
Merge with tip of Master after Viewer release
Diffstat (limited to 'indra/llmessage')
-rw-r--r--indra/llmessage/message.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/llmessage/message.h b/indra/llmessage/message.h
index 52dbf871db..e25a9ea7ef 100644
--- a/indra/llmessage/message.h
+++ b/indra/llmessage/message.h
@@ -35,10 +35,6 @@
#include <netinet/in.h>
#endif
-#if LL_SOLARIS
-#include <netinet/in.h>
-#endif
-
#if LL_WINDOWS
#include "winsock2.h" // htons etc.
#endif