diff options
Diffstat (limited to 'linden/indra/llcommon/llerror.cpp')
-rw-r--r-- | linden/indra/llcommon/llerror.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/linden/indra/llcommon/llerror.cpp b/linden/indra/llcommon/llerror.cpp index 5c7c3cd..487907f 100644 --- a/linden/indra/llcommon/llerror.cpp +++ b/linden/indra/llcommon/llerror.cpp | |||
@@ -1170,6 +1170,10 @@ namespace LLError | |||
1170 | return s.shouldLogCallCounter; | 1170 | return s.shouldLogCallCounter; |
1171 | } | 1171 | } |
1172 | 1172 | ||
1173 | #if LL_WINDOWS | ||
1174 | // VC80 was optimizing the error away. | ||
1175 | #pragma optimize("", off) | ||
1176 | #endif | ||
1173 | void crashAndLoop(const std::string& message) | 1177 | void crashAndLoop(const std::string& message) |
1174 | { | 1178 | { |
1175 | // Now, we go kaboom! | 1179 | // Now, we go kaboom! |
@@ -1182,6 +1186,9 @@ namespace LLError | |||
1182 | // Loop forever, in case the crash didn't work? | 1186 | // Loop forever, in case the crash didn't work? |
1183 | } | 1187 | } |
1184 | } | 1188 | } |
1189 | #if LL_WINDOWS | ||
1190 | #pragma optimize("", on) | ||
1191 | #endif | ||
1185 | 1192 | ||
1186 | std::string utcTime() | 1193 | std::string utcTime() |
1187 | { | 1194 | { |