diff options
| author | Richard Linden <none@none> | 2013-06-05 19:08:35 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-06-05 19:08:35 -0700 |
| commit | 702bd5107a71aa3ac7c779a1e2ff0eaa53161e13 (patch) | |
| tree | feca9cc804b88e4f1b78a811ae7af359c67e5455 /indra/newview/llappviewerwin32.cpp | |
| parent | 6cf85d1bf3eae2d2d798b756100c048ec2b1c411 (diff) | |
| parent | e1d96d72692d70f7e16fb93d6ef1d42c89d26409 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting
Diffstat (limited to 'indra/newview/llappviewerwin32.cpp')
| -rwxr-xr-x[-rw-r--r--] | indra/newview/llappviewerwin32.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp index 8326be433e..a113ab2508 100644..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. @@ -92,7 +93,7 @@ void nvapi_error(NvAPI_Status status) llwarns << szDesc << llendl; //should always trigger when asserts are enabled - llassert(status == NVAPI_OK); + //llassert(status == NVAPI_OK); } // Create app mutex creates a unique global windows object. @@ -509,9 +510,9 @@ bool LLAppViewerWin32::cleanup() return result; } -bool LLAppViewerWin32::initLogging() +void LLAppViewerWin32::initLogging() { - return LLAppViewer::initLogging(); + LLAppViewer::initLogging(); } void LLAppViewerWin32::initConsole() |