summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2018-07-31 18:12:43 +0100
committerGraham Linden <graham@lindenlab.com>2018-07-31 18:12:43 +0100
commit66035a216837154a05f9490ae07adf470d8fe870 (patch)
tree43905c93fdb0319f03039a2d0e11eef2b03c9f7f
parentd748dbce457dabf6bc46eb22c5c5315f50af159c (diff)
Fix broken init of defaulted arg that MSVC should not have let slide.
-rw-r--r--indra/newview/llpanelface.h4
1 files changed, 2 insertions, 2 deletions
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>