diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-12-15 14:05:16 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-12-15 14:05:16 -0800 |
| commit | 9cf8c3e654f38745c8a94cbd85609a17f482266a (patch) | |
| tree | 8cd1586fef29a307b9ab2bbe3711d289efdeb871 /indra/newview/llviewerwindow.cpp | |
| parent | 1f7bf9216869682aa88c9c92b6c15d2d5278902d (diff) | |
| parent | 77aa787c019615d2fe68d31aa07434301535c992 (diff) | |
Automated merge with ssh://rick@hg.lindenlab.com/skolb/media/
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 966aeba25c..43eb3071dd 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -32,6 +32,8 @@ #include "llviewerprecompiledheaders.h" +#include "llviewerwindow.h" + #if LL_WINDOWS #pragma warning (disable : 4355) // 'this' used in initializer list: yes, intentionally #endif @@ -46,7 +48,6 @@ #include "llpanellogin.h" #include "llviewerkeyboard.h" #include "llviewermenu.h" -#include "llviewerwindow.h" #include "llviewquery.h" #include "llxmltree.h" |