diff --git a/doc/contributions.txt b/doc/contributions.txt index 6f4e88e836e27dd189a2be7ad0fe03523200f59d..dabae001a3845c3bd9068797283b99accb65aefa 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 f95a83f427ecedb1a436db333469a21ddecd5519..7e75dca9087df8e663ea7501cf94f43adaec2328 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; }