diff options
| author | Graham Linden <graham@lindenlab.com> | 2013-09-26 11:44:40 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2013-09-26 11:44:40 -0700 |
| commit | 0103cac1ddda96fd470238d2c8b73c2cf55b6c12 (patch) | |
| tree | a485d28fd9861c41bf9b7117c085bd84617f43de /indra/newview/llpanelface.h | |
| parent | dd4beb695a9c800b37b7c9a19d3ac3f4456012f5 (diff) | |
| parent | badb8a945d31aed6f396e7efb521e76083870069 (diff) | |
Merge viewer-bear maint RC changes to get this build closer to the RC it will follow
Diffstat (limited to 'indra/newview/llpanelface.h')
| -rwxr-xr-x | indra/newview/llpanelface.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelface.h b/indra/newview/llpanelface.h index 46b3375f64..b684881225 100755 --- a/indra/newview/llpanelface.h +++ b/indra/newview/llpanelface.h @@ -259,7 +259,7 @@ private: // need to get per-face answer to this question for sane alpha mode retention on updates. // bool is_alpha_face = object->isImageAlphaBlended(face); - + // need to keep this original answer for valid comparisons in logic below // U8 original_default_alpha_mode = is_alpha_face ? LLMaterial::DIFFUSE_ALPHA_MODE_BLEND : LLMaterial::DIFFUSE_ALPHA_MODE_NONE; |