diff options
| author | Samuel Kolb <skolb@lindenlab.com> | 2009-12-16 12:04:38 -0800 |
|---|---|---|
| committer | Samuel Kolb <skolb@lindenlab.com> | 2009-12-16 12:04:38 -0800 |
| commit | bedde40e9475f3772807b6fc48c3039d5993f578 (patch) | |
| tree | ae615503b4c917667a5a0b752dd0a6eca2927e9b /indra/newview/llviewernetwork.cpp | |
| parent | d7533a2c0646826088d5c1f58c84604c0607b8aa (diff) | |
| parent | 0c0cb6fd79d12016b32bb74ce0e9d2c656143902 (diff) | |
local merge
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 |