diff options
| author | Kyle Machulis <qdot@lindenlab.com> | 2007-11-20 23:42:48 +0000 |
|---|---|---|
| committer | Kyle Machulis <qdot@lindenlab.com> | 2007-11-20 23:42:48 +0000 |
| commit | 2e7c0d973ed28d732ea19762099ed3c55123780e (patch) | |
| tree | 36b04301d325e07075880a8a64166c5284d1d61f /indra/newview/llappviewerwin32.cpp | |
| parent | 5356b917545d43df5537128245ee5b786b705b90 (diff) | |
svn merge -r74104:74124 svn+ssh://svn/svn/linden/branches/crash-logger-cleanup-merge-6
Diffstat (limited to 'indra/newview/llappviewerwin32.cpp')
| -rw-r--r-- | indra/newview/llappviewerwin32.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp index 1d7a6690fc..814c209e67 100644 --- a/indra/newview/llappviewerwin32.cpp +++ b/indra/newview/llappviewerwin32.cpp @@ -322,9 +322,16 @@ bool LLAppViewerWin32::initWindow() return LLAppViewer::initWindow(); } -void write_debug_callback(const char* str) +void write_debug_dx(const char* str) { - LLAppViewer::instance()->writeDebug(str); + LLString value = gDebugInfo["DXInfo"].asString(); + value += str; + gDebugInfo["DXInfo"] = value; +} + +void write_debug_dx(const std::string& str) +{ + write_debug_dx(str.c_str()); } bool LLAppViewerWin32::initHardwareTest() @@ -340,7 +347,7 @@ bool LLAppViewerWin32::initHardwareTest() LLSplashScreen::update("Detecting hardware..."); llinfos << "Attempting to poll DirectX for hardware info" << llendl; - gDXHardware.setWriteDebugFunc(write_debug_callback); + gDXHardware.setWriteDebugFunc(write_debug_dx); BOOL probe_ok = gDXHardware.getInfo(vram_only); if (!probe_ok |