diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-05-23 16:24:34 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-05-23 16:24:34 -0700 |
| commit | 260afbcece7db436af411abcba28495bf99fa08b (patch) | |
| tree | 27609345c4a73e0ce9b566e9046abf2f21c25d54 /indra/newview/llpanelface.cpp | |
| parent | 33f674a0d080c5e74ae2f50029b601b4dcecd4d9 (diff) | |
NORSPEC-192 fix more incorrect batching, fix bug in reflecting normal map state in build tool, and protect against callback crashes when switching regions
Diffstat (limited to 'indra/newview/llpanelface.cpp')
| -rwxr-xr-x | indra/newview/llpanelface.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp index 33c77ed98f..27ca13fcf1 100755 --- a/indra/newview/llpanelface.cpp +++ b/indra/newview/llpanelface.cpp @@ -1683,7 +1683,7 @@ void LLPanelFace::updateUI() texture_ctrl = getChild<LLTextureCtrl>("bumpytexture control"); texture_ctrl->setImageAssetID(material->getNormalID()); - if (!material->getNormalID().isNull() && (bumpy == BUMPY_TEXTURE)) + if (!material->getNormalID().isNull()) { material->getNormalOffset(offset_x,offset_y); material->getNormalRepeat(repeat_x,repeat_y); |