diff options
| author | Richard Linden <none@none> | 2013-06-20 16:46:23 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-06-20 16:46:23 -0700 |
| commit | a2a6bf20d71f923e9a5e43f71213fffbfea5a2a6 (patch) | |
| tree | 7e2711d256f98872db24e1f9de4449d47e75ed88 /indra/newview/llappviewerwin32.cpp | |
| parent | 2655c7a17ae38a073dcf8f05b0127b68edc34c95 (diff) | |
| parent | e2e6963677657e4f5c417edc8d60e8b2a37ad204 (diff) | |
merge with release
Diffstat (limited to 'indra/newview/llappviewerwin32.cpp')
| -rwxr-xr-x | indra/newview/llappviewerwin32.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp index 3cf3c739d9..b7cdcb058b 100755 --- a/indra/newview/llappviewerwin32.cpp +++ b/indra/newview/llappviewerwin32.cpp @@ -29,11 +29,12 @@ #ifdef INCLUDE_VLD #include "vld.h" #endif +#include "llwin32headers.h" -#include "llappviewerwin32.h" +#include "llwindowwin32.h" // *FIX: for setting gIconResource. +#include "llappviewerwin32.h" -#include "llwindowwin32.h" // *FIX: for setting gIconResource. #include "llgl.h" #include "res/resource.h" // *FIX: for setting gIconResource. |