Second Life viewer sources 1.22.2-RC

3 files changed, 10 insertions, 3 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
                 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/linden/indra/llcommon/llerrorcontrol.h b/linden/indra/llcommon/llerrorcontrol.h
index 2c36871..a97abef 100644
--- a/linden/indra/llcommon/llerrorcontrol.h
+++ b/linden/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/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h
index 6ff2604..e027fad 100644
--- a/linden/indra/llcommon/llversionviewer.h
+++ b/linden/indra/llcommon/llversionviewer.h
@@ -34,7 +34,7 @@
 
 const S32 LL_VERSION_MAJOR = 1;
 const S32 LL_VERSION_MINOR = 22;
-const S32 LL_VERSION_PATCH = 1;
+const S32 LL_VERSION_PATCH = 2;
 const S32 LL_VERSION_BUILD = 0;
 
 const char * const LL_CHANNEL = "Second Life Release";