From f40dd76521c9ddab1fcd3ddca029802cf3bdd99b Mon Sep 17 00:00:00 2001
From: ruslantproductengine <ruslantproductengine@lindenlab.com>
Date: Thu, 24 Jul 2014 00:38:18 +0300
Subject: [PATCH] MAINT-4092 FIXED Prim faces with opaque diffuse maps, with
material set to ALPHA_MODE_BLEND, do not render when ALM is enabled : replace
nullptr to NULL (please use modern compilers)
---
indra/newview/llvovolume.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index c25722b6351..4295ea02d52 100755
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -2045,7 +2045,7 @@ S32 LLVOVolume::setTEMaterialParams(const U8 te, const LLMaterialPtr pMaterialPa
if (pMaterialParams && getTEImage(te) && 3 == getTEImage(te)->getComponents() && pMaterialParams->getDiffuseAlphaMode())
{
LLViewerObject::setTEMaterialID(te, LLMaterialID::null);
- res = LLViewerObject::setTEMaterialParams(te, nullptr);
+ res = LLViewerObject::setTEMaterialParams(te, NULL);
}
else
{
--
GitLab