diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-06-07 12:50:02 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-06-07 12:50:02 -0700 |
| commit | c60eac25e5f1655e2c1d2c7ed2680da39db07f51 (patch) | |
| tree | 2d36cdf48bd0e01e0cc01503ceca02c8016c8b7f /indra/newview | |
| parent | 3a4d72f8d993656a566847f1bb3cc9ad8ab9b398 (diff) | |
| parent | bc6070bd197159dd81750d1e2e8af493864be818 (diff) | |
Merge MAINT-2740 crash fix
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llpanelface.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp index 2f6c285a80..d873cab59a 100755 --- a/indra/newview/llpanelface.cpp +++ b/indra/newview/llpanelface.cpp @@ -1513,6 +1513,10 @@ void LLPanelFace::onSelectColor(const LLSD& data) void LLPanelFace::onCommitMaterialsMedia(LLUICtrl* ctrl, void* userdata) { LLPanelFace* self = (LLPanelFace*) userdata; + LLUUID specmap = getCurrentSpecularMap(); + LLUUID normmap = getCurrentNormalMap(); + self->updateShinyControls(!specmap.isNull(), true); + self->updateBumpyControls(!normmap.isNull(), true); self->updateUI(); } |