From 430f9420cf0094635b0b0428a29ff7dfaf5718e8 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Thu, 7 Jun 2018 22:18:15 +0100 Subject: SL-915 - more on dynamic extent tracking, possible fix for 32-bit crash issues --- indra/llcommon/llerror.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'indra/llcommon/llerror.cpp') diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp index f31a054139..916555a71d 100644 --- a/indra/llcommon/llerror.cpp +++ b/indra/llcommon/llerror.cpp @@ -51,6 +51,10 @@ #include "llstl.h" #include "lltimer.h" +//#if LL_WINDOWS +//#pragma optimize("", off) +//#endif + namespace { #if LL_WINDOWS void debugger_print(const std::string& s) @@ -361,6 +365,7 @@ namespace } } + LL_INFOS("LogControlFile") << "logging reconfiguring from " << filename() << LL_ENDL; LLError::configure(configuration); LL_INFOS("LogControlFile") << "logging reconfigured from " << filename() << LL_ENDL; return true; @@ -1292,7 +1297,7 @@ namespace LLError #if LL_WINDOWS // VC80 was optimizing the error away. - #pragma optimize("", off) +// #pragma optimize("", off) #endif void crashAndLoop(const std::string& message) { @@ -1310,7 +1315,7 @@ namespace LLError exit(EXIT_FAILURE); } #if LL_WINDOWS - #pragma optimize("", on) +// #pragma optimize("", on) #endif std::string utcTime() -- cgit v1.2.3