aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llcommon/llerror.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-12-09 22:25:37 -0600
committerJacek Antonelli2008-12-09 22:25:41 -0600
commit22b861982f2efd5d16097a012627e73b9fb85834 (patch)
tree6152a84b92c682e271bdd52d46cd1728454f679a /linden/indra/llcommon/llerror.cpp
parentSecond Life viewer sources 1.22.1-RC (diff)
downloadmeta-impy-22b861982f2efd5d16097a012627e73b9fb85834.zip
meta-impy-22b861982f2efd5d16097a012627e73b9fb85834.tar.gz
meta-impy-22b861982f2efd5d16097a012627e73b9fb85834.tar.bz2
meta-impy-22b861982f2efd5d16097a012627e73b9fb85834.tar.xz
Second Life viewer sources 1.22.2-RC
Diffstat (limited to 'linden/indra/llcommon/llerror.cpp')
-rw-r--r--linden/indra/llcommon/llerror.cpp7
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 {