diff options
| author | Mark Palange <palange@lindenlab.com> | 2008-12-23 19:39:58 +0000 |
|---|---|---|
| committer | Mark Palange <palange@lindenlab.com> | 2008-12-23 19:39:58 +0000 |
| commit | fb793870fe95f1951d7c30ea6068e187b9dededd (patch) | |
| tree | 6d11632353ff4fb07133625ec5031b135b1e2882 /indra/llcommon/llerror.cpp | |
| parent | d182b9fb82b9c63f41d81bc80dbbfe627475facf (diff) | |
QAR-1142 merging 1.22 RC0-RC4 changes.
svn merge -c 106471 svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_1-22-106055_merge
Diffstat (limited to 'indra/llcommon/llerror.cpp')
| -rw-r--r-- | indra/llcommon/llerror.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp index b3d3122397..a54785134c 100644 --- a/indra/llcommon/llerror.cpp +++ b/indra/llcommon/llerror.cpp @@ -1170,6 +1170,10 @@ namespace LLError return s.shouldLogCallCounter; } +#if LL_WINDOWS + // VC80 was optimizing the error away. + #pragma optimize("", off) +#endif void crashAndLoop(const std::string& message) { // Now, we go kaboom! @@ -1182,6 +1186,9 @@ namespace LLError // Loop forever, in case the crash didn't work? } } +#if LL_WINDOWS + #pragma optimize("", on) +#endif std::string utcTime() { |