diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-07-06 15:49:32 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-07-06 15:49:32 -0400 |
| commit | 419bfb16fdd9b79d32736fd80652685a07f9e39f (patch) | |
| tree | 4afafc0665ca3b486e2507369d9d214d40abf9ac /indra/newview/llappviewerwin32.cpp | |
| parent | ced040f8aef5a764c2e6fb261d5bbecd4df75064 (diff) | |
| parent | 7de36b3d4217f5ceee8b46a59983229b7af35981 (diff) | |
automated merge
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(); } |