Put in some changes along sg1.4 dev history.

2010-11-21 04:28:31 +01:00
parent 6866a36a5c
commit d68736da39
182 changed files with 2418 additions and 1151 deletions
--- a/indra/llmessage/llnetcanary.cpp
+++ b/indra/llmessage/llnetcanary.cpp
@@ -1,5 +1,6 @@
 // <edit>
 #include "llnetcanary.h"
+#include "linden_common.h"
 #include "llerror.h"
 #ifdef _MSC_VER
 #include <winsock2.h>