diff options
| author | Andrew A. de Laix <alain@lindenlab.com> | 2010-07-02 09:05:16 -0700 |
|---|---|---|
| committer | Andrew A. de Laix <alain@lindenlab.com> | 2010-07-02 09:05:16 -0700 |
| commit | bb3114af874ecdc628c2f49ff73b7b60feb2de5e (patch) | |
| tree | b069d7e91f0b6a39a1cdfb27f899308407aa69dc /indra/newview/llappviewerwin32.cpp | |
| parent | 1417bd3985f339915f259bf5971ef21e47e30163 (diff) | |
| parent | 6098fd2ebcd1bd78a8f8c638f707e8a14033df9b (diff) | |
merge changes from viewer-dev.
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(); } |