summaryrefslogtreecommitdiff
path: root/indra/llprimitive/llprimitive.cpp
diff options
context:
space:
mode:
authorruslantproductengine <ruslantproductengine@lindenlab.com>2014-11-13 18:47:57 +0200
committerruslantproductengine <ruslantproductengine@lindenlab.com>2014-11-13 18:47:57 +0200
commitc686407731751ababecf01569fa02eb5ba62337d (patch)
treecc36e977dc5ef1888442dadf0bc79eb22a2e881e /indra/llprimitive/llprimitive.cpp
parent444c9a70859b5f918fbfb3798f1612c3626fd7ce (diff)
MAINT-4092 FIXED Prim faces with opaque diffuse maps, with material set to ALPHA_MODE_BLEND, do not render
MAINT-4645 FIXED [viewer-lion] The build tool shows normal or specular map as 'none' when one exists
Diffstat (limited to 'indra/llprimitive/llprimitive.cpp')
-rwxr-xr-xindra/llprimitive/llprimitive.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llprimitive/llprimitive.cpp b/indra/llprimitive/llprimitive.cpp
index a505ea04a7..aa44dc67d5 100755
--- a/indra/llprimitive/llprimitive.cpp
+++ b/indra/llprimitive/llprimitive.cpp
@@ -324,6 +324,11 @@ S32 LLPrimitive::setTEMaterialParams(const U8 index, const LLMaterialPtr pMateri
return mTextureList.setMaterialParams(index, pMaterialParams);
}
+LLMaterialPtr LLPrimitive::getTEMaterialParams(const U8 index)
+{
+ return mTextureList.getMaterialParams(index);
+}
+
//===============================================================
S32 LLPrimitive::setTEBumpShinyFullbright(const U8 index, const U8 bump)
{