diff options
| author | simon <none@none> | 2014-04-21 12:48:50 -0700 |
|---|---|---|
| committer | simon <none@none> | 2014-04-21 12:48:50 -0700 |
| commit | a5a0a0b1362da5d00cc6d09bb841ef6167bb2922 (patch) | |
| tree | 0b58bf76487dca0bc439d1f99cd568f970b9cc32 /indra/win_crash_logger/llcrashloggerwindows.cpp | |
| parent | 114084bb80d4991519e2ca4020823319810c64b2 (diff) | |
| parent | 0b9a777bfd3c85390c55d91fc3dc5c4bee9bf71b (diff) | |
Merge downstream code
Diffstat (limited to 'indra/win_crash_logger/llcrashloggerwindows.cpp')
| -rw-r--r-- | indra/win_crash_logger/llcrashloggerwindows.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/win_crash_logger/llcrashloggerwindows.cpp b/indra/win_crash_logger/llcrashloggerwindows.cpp index 9fd66d5421..6a272fd166 100644 --- a/indra/win_crash_logger/llcrashloggerwindows.cpp +++ b/indra/win_crash_logger/llcrashloggerwindows.cpp @@ -484,7 +484,7 @@ bool LLCrashLoggerWindows::mainLoop() if (mCrashBehavior == CRASH_BEHAVIOR_ALWAYS_SEND) { llinfos << "Showing crash report submit progress window." << llendl; - ShowWindow(gHwndProgress, SW_SHOW ); + //ShowWindow(gHwndProgress, SW_SHOW ); Maint-5707 sendCrashLogs(); } else if (mCrashBehavior == CRASH_BEHAVIOR_ASK) |