diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2017-10-13 12:23:08 +0300 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2017-10-13 12:23:08 +0300 |
| commit | 788d74507139e6db7037daff619b188264fc2401 (patch) | |
| tree | b96be270daa55f8a98604e7309926a265d1423e1 | |
| parent | 5ee30b7da5ccd92baa1099a579fda34dab9e3d49 (diff) | |
MAINT-7899 FIXED Apparent broken material texture selection
| -rwxr-xr-x | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/llpanelface.cpp | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 6f4e88e836..dabae001a3 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -215,6 +215,7 @@ Ansariel Hiller MAINT-7028 MAINT-7059 MAINT-6519 + MAINT-7899 Aralara Rajal Arare Chantilly CHUIBUG-191 diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp index f95a83f427..7e75dca908 100644 --- a/indra/newview/llpanelface.cpp +++ b/indra/newview/llpanelface.cpp @@ -2377,8 +2377,8 @@ void LLPanelFace::onCommitPlanarAlign(LLUICtrl* ctrl, void* userdata) void LLPanelFace::onTextureSelectionChanged(LLInventoryItem* itemp) { LL_DEBUGS("Materials") << "item asset " << itemp->getAssetUUID() << LL_ENDL; - LLRadioGroup* radio_mat_type = getChild<LLRadioGroup>("radio_material_type"); - if(radio_mat_type) + LLRadioGroup* radio_mat_type = findChild<LLRadioGroup>("radio_material_type"); + if(!radio_mat_type) { return; } |