diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-01-13 13:46:45 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-01-13 13:46:45 -0500 |
| commit | 6f3cf79a3afa66db229a1c1068e0c01f246f0b79 (patch) | |
| tree | 5eb6e710adc6a0c770f681fabb44fd385dbef977 /indra/newview/llpanelface.cpp | |
| parent | ccd10beb6f8523c401b08d57e916c85d756eb27e (diff) | |
| parent | fad02b30ce61a38007c5cd450cbdd2e09464888d (diff) | |
merge changes for 3.7.24-release
Diffstat (limited to 'indra/newview/llpanelface.cpp')
| -rwxr-xr-x | indra/newview/llpanelface.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp index de2d315480..cc8b7d2a52 100755 --- a/indra/newview/llpanelface.cpp +++ b/indra/newview/llpanelface.cpp @@ -1846,6 +1846,8 @@ void LLPanelFace::onCancelNormalTexture(const LLSD& data) U8 bumpy = 0; bool identical_bumpy = false; LLSelectedTE::getBumpmap(bumpy, identical_bumpy); + LLUUID spec_map_id = getChild<LLTextureCtrl>("bumpytexture control")->getImageAssetID(); + bumpy = spec_map_id.isNull() ? bumpy : BUMPY_TEXTURE; sendBump(bumpy); } |