From fb793870fe95f1951d7c30ea6068e187b9dededd Mon Sep 17 00:00:00 2001
From: Mark Palange <palange@lindenlab.com>
Date: Tue, 23 Dec 2008 19:39:58 +0000
Subject: 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

---
 indra/llcommon/llerror.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'indra/llcommon/llerror.cpp')

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()
 	{
-- 
cgit v1.2.3