diff options
author | McCabe Maxsted | 2009-11-09 18:20:59 -0700 |
---|---|---|
committer | McCabe Maxsted | 2009-11-09 18:20:59 -0700 |
commit | 2547cfa6e15657c262cefc5a9407ecc4f813a3a5 (patch) | |
tree | 0603b31c9a0ac824eb26f2c487f9dc23ed5832eb | |
parent | Removed deprecated EGridInfo from llloginhandler (diff) | |
download | meta-impy-2547cfa6e15657c262cefc5a9407ecc4f813a3a5.zip meta-impy-2547cfa6e15657c262cefc5a9407ecc4f813a3a5.tar.gz meta-impy-2547cfa6e15657c262cefc5a9407ecc4f813a3a5.tar.bz2 meta-impy-2547cfa6e15657c262cefc5a9407ecc4f813a3a5.tar.xz |
Fixed llstartup header issue and removed WIN32_LEAN_AND_MEAN define
-rw-r--r-- | ChangeLog.txt | 5 | ||||
-rw-r--r-- | linden/indra/newview/llstartup.cpp | 9 |
2 files changed, 6 insertions, 8 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index 73d2436..30bf8a6 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt | |||
@@ -4,6 +4,11 @@ | |||
4 | 4 | ||
5 | 2009-11-09 McCabe Maxsted <hakushakukun@gmail.com> | 5 | 2009-11-09 McCabe Maxsted <hakushakukun@gmail.com> |
6 | 6 | ||
7 | * Fixed llstartup header issue and removed WIN32_LEAN_AND_MEAN define. | ||
8 | |||
9 | modified: linden/indra/newview/llstartup.cpp | ||
10 | |||
11 | |||
7 | * Removed deprecated EGridInfo from llloginhandler. | 12 | * Removed deprecated EGridInfo from llloginhandler. |
8 | 13 | ||
9 | modified: linden/indra/newview/llloginhandler.cpp | 14 | modified: linden/indra/newview/llloginhandler.cpp |
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp index 4d35242..c5bf2c7 100644 --- a/linden/indra/newview/llstartup.cpp +++ b/linden/indra/newview/llstartup.cpp | |||
@@ -30,14 +30,7 @@ | |||
30 | * $/LicenseInfo$ | 30 | * $/LicenseInfo$ |
31 | */ | 31 | */ |
32 | 32 | ||
33 | // #include "llviewerprecompiledheaders.h" | 33 | #include "llviewerprecompiledheaders.h" |
34 | |||
35 | |||
36 | #if LL_WINDOWS | ||
37 | #define WIN32_LEAN_AND_MEAN | ||
38 | #include <winsock2.h> | ||
39 | #include <windows.h> | ||
40 | #endif | ||
41 | 34 | ||
42 | #include "llstartup.h" | 35 | #include "llstartup.h" |
43 | 36 | ||