Second Life viewer sources 1.18.6.1-RC

4 files changed, 6 insertions, 2 deletions

diff --git a/linden/indra/llcommon/indra_constants.h b/linden/indra/llcommon/indra_constants.h
index b7d3578..0195893 100644
--- a/linden/indra/llcommon/indra_constants.h
+++ b/linden/indra/llcommon/indra_constants.h
@@ -336,7 +336,7 @@ const U32 MAP_ITEM_CLASSIFIED = 0x08;
 
 // Crash reporter behavior
 const char* const CRASH_SETTINGS_FILE = "crash_settings.xml";
-const char* const CRASH_BEHAVIOR_SETTING = "CrashBehavior";
+const char* const CRASH_BEHAVIOR_SETTING = "CrashLogBehavior";
 const S32 CRASH_BEHAVIOR_ASK = 0;
 const S32 CRASH_BEHAVIOR_ALWAYS_SEND = 1;
 const S32 CRASH_BEHAVIOR_NEVER_SEND = 2;
diff --git a/linden/indra/llcommon/llcommon.vcproj b/linden/indra/llcommon/llcommon.vcproj
index 0ab544e..f16092b 100644
--- a/linden/indra/llcommon/llcommon.vcproj
+++ b/linden/indra/llcommon/llcommon.vcproj
@@ -64,6 +64,7 @@
                         CharacterSet="1">
                         <Tool
                                 Name="VCCLCompilerTool"
+                                AdditionalOptions="/Oy-"
                                 GlobalOptimizations="TRUE"
                                 InlineFunctionExpansion="2"
                                 EnableIntrinsicFunctions="TRUE"
@@ -111,6 +112,7 @@
                         CharacterSet="1">
                         <Tool
                                 Name="VCCLCompilerTool"
+                                AdditionalOptions="/Oy-"
                                 Optimization="0"
                                 AdditionalIncludeDirectories="..\..\libraries\i686-win32\include;..\..\libraries\include\"
                                 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE;XML_STATIC;APR_DECLARE_STATIC"
diff --git a/linden/indra/llcommon/llcommon_vc8.vcproj b/linden/indra/llcommon/llcommon_vc8.vcproj
index 4790b61..6f8f26b 100644
--- a/linden/indra/llcommon/llcommon_vc8.vcproj
+++ b/linden/indra/llcommon/llcommon_vc8.vcproj
@@ -109,6 +109,7 @@
                         />

                         <Tool

                                 Name="VCCLCompilerTool"

+                                AdditionalOptions="/Oy-"

                                 InlineFunctionExpansion="2"

                                 EnableIntrinsicFunctions="true"

                                 AdditionalIncludeDirectories="..\..\libraries\i686-win32\include;..\..\libraries\include\"

@@ -177,6 +178,7 @@
                         />

                         <Tool

                                 Name="VCCLCompilerTool"

+                                AdditionalOptions="/Oy-"

                                 Optimization="0"

                                 AdditionalIncludeDirectories="..\..\libraries\i686-win32\include;..\..\libraries\include\"

                                 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE;XML_STATIC;APR_DECLARE_STATIC"

diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h
index f9f3bf2..82b80ea 100644
--- a/linden/indra/llcommon/llversionviewer.h
+++ b/linden/indra/llcommon/llversionviewer.h
@@ -35,7 +35,7 @@
 const S32 LL_VERSION_MAJOR = 1;
 const S32 LL_VERSION_MINOR = 18;
 const S32 LL_VERSION_PATCH = 6;
-const S32 LL_VERSION_BUILD = 0;
+const S32 LL_VERSION_BUILD = 1;
 
 const char * const LL_CHANNEL = "Second Life Release";