From 66035a216837154a05f9490ae07adf470d8fe870 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Tue, 31 Jul 2018 18:12:43 +0100
Subject: Fix broken init of defaulted arg that MSVC should not have let slide.
---
indra/newview/llpanelface.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'indra')
diff --git a/indra/newview/llpanelface.h b/indra/newview/llpanelface.h
index 17850dbc77..4937966034 100644
--- a/indra/newview/llpanelface.h
+++ b/indra/newview/llpanelface.h
@@ -332,9 +332,9 @@ private:
template<
typename DataType,
- typename ReturnType,
+ typename ReturnType,
ReturnType (LLMaterial::* const MaterialGetFunc)() const >
- static void getTEMaterialValue(DataType& data_to_return, bool& identical,DataType default_value, bool has_tolerance = HasTolerance, DataType tolerance = DataType())
+ static void getTEMaterialValue(DataType& data_to_return, bool& identical,DataType default_value, bool has_tolerance = false, DataType tolerance = DataType())
{
DataType data_value;
struct GetTEMaterialVal : public LLSelectedTEGetFunctor<DataType>
--
cgit v1.2.3