diff --git a/indra/llcommon/lltraceaccumulators.cpp b/indra/llcommon/lltraceaccumulators.cpp
index 385d31edd7b7055115a8fdec30510b93bab6c505..b1c23c6fb7a35dfafb800f9d05b29f134ff9cfe2 100644
--- a/indra/llcommon/lltraceaccumulators.cpp
+++ b/indra/llcommon/lltraceaccumulators.cpp
@@ -291,8 +291,8 @@ void EventAccumulator::reset( const EventAccumulator* other )
 {
 	mNumSamples = 0;
 	mSum = 0;
-	mMin = NaN;
-	mMax = NaN;
+	mMin = F32(NaN);
+	mMax = F32(NaN);
 	mMean = NaN;
 	mSumOfSquares = 0;
 	mLastValue = other ? other->mLastValue : NaN;
diff --git a/indra/llcommon/lltraceaccumulators.h b/indra/llcommon/lltraceaccumulators.h
index 6f27b97dff958eac748e38e24da3f05fcb3cacde..8eb5338a2a92a65d3efe9f3685e720c289f2dd30 100644
--- a/indra/llcommon/lltraceaccumulators.h
+++ b/indra/llcommon/lltraceaccumulators.h
@@ -242,8 +242,8 @@ namespace LLTrace
 
 		EventAccumulator()
 		:	mSum(0),
-			mMin(NaN),
-			mMax(NaN),
+			mMin(F32(NaN)),
+			mMax(F32(NaN)),
 			mMean(NaN),
 			mSumOfSquares(0),
 			mNumSamples(0),
@@ -313,8 +313,8 @@ namespace LLTrace
 
 		SampleAccumulator()
 		:	mSum(0),
-			mMin(NaN),
-			mMax(NaN),
+			mMin(F32(NaN)),
+			mMax(F32(NaN)),
 			mMean(NaN),
 			mSumOfSquares(0),
 			mLastSampleTimeStamp(0),