diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-07-20 19:17:59 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-07-20 19:17:59 +0100 |
| commit | ba31900ea80dd0bdb29fa8f4100f992489b25a1e (patch) | |
| tree | e5580e5aa719806d0920a256e98b2d9c092ebf8a /indra/llprimitive/llmaterial.cpp | |
| parent | f82443dd5541b4ec1cc30acb9dd4ba3375687d10 (diff) | |
MAINT-8891 viewer-side fix for redundant setting of specular offset in LLSD to struct translation
Diffstat (limited to 'indra/llprimitive/llmaterial.cpp')
| -rw-r--r-- | indra/llprimitive/llmaterial.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/llprimitive/llmaterial.cpp b/indra/llprimitive/llmaterial.cpp index c0fefaae73..3f84bbf517 100644 --- a/indra/llprimitive/llmaterial.cpp +++ b/indra/llprimitive/llmaterial.cpp @@ -393,7 +393,6 @@ void LLMaterial::fromLLSD(const LLSD& material_data) mSpecularOffsetY = F32(specularOffsetYInt) / MATERIALS_MULTIPLIER; mSpecularRotation = F32(specularRotInt) / MATERIALS_MULTIPLIER; - mSpecularOffsetY = ((F32)getMaterialField<LLSD::Integer>(material_data, MATERIALS_CAP_SPECULAR_MAP_OFFSET_Y_FIELD, LLSD::TypeInteger)) / MATERIALS_MULTIPLIER; mSpecularRepeatX = ((F32)getMaterialField<LLSD::Integer>(material_data, MATERIALS_CAP_SPECULAR_MAP_REPEAT_X_FIELD, LLSD::TypeInteger)) / MATERIALS_MULTIPLIER; mSpecularRepeatY = ((F32)getMaterialField<LLSD::Integer>(material_data, MATERIALS_CAP_SPECULAR_MAP_REPEAT_Y_FIELD, LLSD::TypeInteger)) / MATERIALS_MULTIPLIER; mSpecularRotation = ((F32)getMaterialField<LLSD::Integer>(material_data, MATERIALS_CAP_SPECULAR_MAP_ROTATION_FIELD, LLSD::TypeInteger)) / MATERIALS_MULTIPLIER; |