diff options
| author | callum <none@none> | 2009-12-15 17:53:03 -0800 |
|---|---|---|
| committer | callum <none@none> | 2009-12-15 17:53:03 -0800 |
| commit | b7747a815f1fb7ee49804b6b2daf2e347b27f7a5 (patch) | |
| tree | 7edef8c608cc99cb0e657694d259598294858851 /indra/newview/llviewernetwork.cpp | |
| parent | f923f896bca0d0d8459c35a5ef8e0d0171cbe664 (diff) | |
| parent | fc40740e1e5a7fcb1ed8bf3b4b6eaffe7d3d9c07 (diff) | |
Merge with tip before push
Diffstat (limited to 'indra/newview/llviewernetwork.cpp')
| -rw-r--r-- | indra/newview/llviewernetwork.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llviewernetwork.cpp b/indra/newview/llviewernetwork.cpp index 801c46035a..d7b55d7e97 100644 --- a/indra/newview/llviewernetwork.cpp +++ b/indra/newview/llviewernetwork.cpp @@ -34,8 +34,11 @@ #include "llviewerprecompiledheaders.h" #include "llviewernetwork.h" -#include "llviewercontrol.h" + #include "llevents.h" +#include "net.h" + +#include "llviewercontrol.h" #include "lllogin.h" struct LLGridData |