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

3 files changed, 11 insertions, 4 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()
 	{
diff --git a/indra/llcommon/llerrorcontrol.h b/indra/llcommon/llerrorcontrol.h
index 528704d064..bab4af33e6 100644
--- a/indra/llcommon/llerrorcontrol.h
+++ b/indra/llcommon/llerrorcontrol.h
@@ -82,9 +82,9 @@ namespace LLError
 		Control functions.
 	*/
 
-	typedef void (*FatalFunction)(const std::string& message);
+	typedef void(*FatalFunction)(const std::string& message);
 	void crashAndLoop(const std::string& message);
-		// Default fatal funtion: divides by zero and loops forever
+		// Default fatal funtion: access null pointer and loops forever
 
 	void setFatalFunction(FatalFunction);
 		// The fatal function will be called when an message of LEVEL_ERROR
diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h
index 27d69c453d..814daa9029 100644
--- a/indra/llcommon/llversionviewer.h
+++ b/indra/llcommon/llversionviewer.h
@@ -34,8 +34,8 @@
 
 const S32 LL_VERSION_MAJOR = 1;
 const S32 LL_VERSION_MINOR = 22;
-const S32 LL_VERSION_PATCH = 0;
-const S32 LL_VERSION_BUILD = 100000;
+const S32 LL_VERSION_PATCH = 4;
+const S32 LL_VERSION_BUILD = 0;
 
 const char * const LL_CHANNEL = "Second Life Release";