summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterregioninfo.cpp
diff options
context:
space:
mode:
authorJonathan "Geenz" Goodman <geenz@geenzo.com>2025-03-11 22:44:49 -0400
committerJonathan "Geenz" Goodman <geenz@geenzo.com>2025-03-11 22:44:49 -0400
commite0d14e02e152b4e75ff8bdd974677f9669163d68 (patch)
tree3379d14c9c5d8c188d2fb716e61edd09fc1219a9 /indra/newview/llfloaterregioninfo.cpp
parent179b29252d8bb28e11686a1852c8e8ffcd98ecc0 (diff)
parentb50ad90febda24d2296541f46ea1a129232aad70 (diff)
Merge branch 'release/2025.03' into rye/forevermac
Diffstat (limited to 'indra/newview/llfloaterregioninfo.cpp')
-rw-r--r--indra/newview/llfloaterregioninfo.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp
index 3239921259..334f32d051 100644
--- a/indra/newview/llfloaterregioninfo.cpp
+++ b/indra/newview/llfloaterregioninfo.cpp
@@ -851,6 +851,13 @@ void LLPanelRegionInfo::initCtrl(const std::string& name)
getChild<LLUICtrl>(name)->setCommitCallback(boost::bind(&LLPanelRegionInfo::onChangeAnything, this));
}
+void LLPanelRegionInfo::initAndSetTexCtrl(LLTextureCtrl*& ctrl, const std::string& name)
+{
+ ctrl = findChild<LLTextureCtrl>(name);
+ if (ctrl)
+ ctrl->setOnSelectCallback([this](LLUICtrl* ctrl, const LLSD& param){ onChangeAnything(); });
+}
+
template<typename CTRL>
void LLPanelRegionInfo::initAndSetCtrl(CTRL*& ctrl, const std::string& name)
{
@@ -1580,7 +1587,7 @@ bool LLPanelRegionTerrainInfo::postBuild()
for(S32 i = 0; i < LLTerrainMaterials::ASSET_COUNT; ++i)
{
- initAndSetCtrl(mTextureDetailCtrl[i], llformat("texture_detail_%d", i));
+ initAndSetTexCtrl(mTextureDetailCtrl[i], llformat("texture_detail_%d", i));
if (mTextureDetailCtrl[i])
{
mTextureDetailCtrl[i]->setBakeTextureEnabled(false);