diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-06-06 22:43:38 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-06-06 22:43:38 +0000 |
| commit | ad332810078a0bbb8fa08fcbfdf3d756de6914f6 (patch) | |
| tree | 1608b2db5d620d323673607ea7ddadfba9d58bda /indra/newview/llappviewerwin32.cpp | |
| parent | a7d9a543e587ffe84b355db7a2e8193bfe6c68b6 (diff) | |
QAR-650 - Viewer RC 9 merge -> release (post cmake)
merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release
Diffstat (limited to 'indra/newview/llappviewerwin32.cpp')
| -rw-r--r-- | indra/newview/llappviewerwin32.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp index dee36fa3c3..e2663f05bd 100644 --- a/indra/newview/llappviewerwin32.cpp +++ b/indra/newview/llappviewerwin32.cpp @@ -71,7 +71,6 @@ extern "C" { #endif #endif - LONG WINAPI viewer_windows_exception_handler(struct _EXCEPTION_POINTERS *exception_infop) { // *NOTE:Mani - this code is stolen from LLApp, where its never actually used. @@ -421,9 +420,10 @@ void LLAppViewerWin32::handleCrashReporting() exe_path += "win_crash_logger.exe"; std::string arg_string = "-user "; - arg_string += gGridName; - - switch(getCrashBehavior()) + arg_string += LLViewerLogin::getInstance()->getGridLabel(); + + S32 cb = gCrashSettings.getS32(CRASH_BEHAVIOR_SETTING); + switch(cb) { case CRASH_BEHAVIOR_ASK: default: |