diff options
author | Richard Linden <none@none> | 2012-11-19 19:06:36 -0800 |
---|---|---|
committer | Richard Linden <none@none> | 2012-11-19 19:06:36 -0800 |
commit | c0224cc47a2994956f20e8f65177b60cc709e434 (patch) | |
tree | 01d305fff69ca9cec713631d04aa76a4a33c79ca /indra/newview/llappviewerwin32.cpp | |
parent | 2d1a903d39a971775436ba4e1dfb7f630226c15c (diff) | |
parent | 6db6cb39f41e921e75970d1570a74cf35d353a35 (diff) |
merge with viewer-development
Diffstat (limited to 'indra/newview/llappviewerwin32.cpp')
-rw-r--r-- | indra/newview/llappviewerwin32.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp index e0ca1232b0..510ec47a31 100644 --- a/indra/newview/llappviewerwin32.cpp +++ b/indra/newview/llappviewerwin32.cpp @@ -32,7 +32,6 @@ #include "llappviewerwin32.h" -#include "llmemtype.h" #include "llwindowwin32.h" // *FIX: for setting gIconResource. #include "llgl.h" @@ -117,8 +116,6 @@ int APIENTRY WINMAIN(HINSTANCE hInstance, #endif // _DEBUG #endif // INCLUDE_VLD - LLMemType mt1(LLMemType::MTYPE_STARTUP); - const S32 MAX_HEAPS = 255; DWORD heap_enable_lfh_error[MAX_HEAPS]; S32 num_heaps = 0; |