diff options
| author | Andrew A. de Laix <alain@lindenlab.com> | 2010-07-02 09:41:47 -0700 |
|---|---|---|
| committer | Andrew A. de Laix <alain@lindenlab.com> | 2010-07-02 09:41:47 -0700 |
| commit | 0ad0eaa78f39790e65a2568bce096ca7d150e132 (patch) | |
| tree | de5f69a0238b60dac4faac42afe85f43226e95a7 /indra/newview/llappviewerwin32.cpp | |
| parent | 695671d51e1bb7c1039fffa057d0477210aca308 (diff) | |
| parent | bb3114af874ecdc628c2f49ff73b7b60feb2de5e (diff) | |
Automated merge with ssh://hg.lindenlab.com/q/viewer-release
Diffstat (limited to 'indra/newview/llappviewerwin32.cpp')
| -rw-r--r-- | indra/newview/llappviewerwin32.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp index e3ef04d03d..8c9fd09dcb 100644 --- a/indra/newview/llappviewerwin32.cpp +++ b/indra/newview/llappviewerwin32.cpp @@ -64,6 +64,10 @@ #include "llcommandlineparser.h" #include "lltrans.h" +#ifndef LL_RELEASE_FOR_DOWNLOAD +#include "llwindebug.h" +#endif + // *FIX:Mani - This hack is to fix a linker issue with libndofdev.lib // The lib was compiled under VS2005 - in VS2003 we need to remap assert #ifdef LL_DEBUG @@ -342,6 +346,10 @@ bool LLAppViewerWin32::init() llinfos << "Turning off Windows error reporting." << llendl; disableWinErrorReporting(); +#ifndef LL_RELEASE_FOR_DOWNLOAD + LLWinDebug::instance().init(); +#endif + return LLAppViewer::init(); } |