From 788d74507139e6db7037daff619b188264fc2401 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Fri, 13 Oct 2017 12:23:08 +0300
Subject: [PATCH] MAINT-7899 FIXED Apparent broken material texture selection
---
doc/contributions.txt | 1 +
indra/newview/llpanelface.cpp | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 6f4e88e836e..dabae001a38 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 f95a83f427e..7e75dca9087 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;
}
--
GitLab