diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-03-21 16:04:33 +0800 | 
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-03-21 19:36:44 +0800 | 
| commit | 2fb48eb9be6df00c3baed955fd84f4d8a1ea1d9a (patch) | |
| tree | b6ba5ff2c3ebc24477e3c6d701f91672c7499132 /indra/newview/llfloaterregioninfo.cpp | |
| parent | 0cdb7d97f67b3a67097e56e71021cb6120ec8a8b (diff) | |
| parent | 895a6739d3d02e11750e9ada72b730d02998d4c0 (diff) | |
Merge tag 'Second_Life_Release#895a6739-2025.03' into 2025.03
Diffstat (limited to 'indra/newview/llfloaterregioninfo.cpp')
| -rw-r--r-- | indra/newview/llfloaterregioninfo.cpp | 9 | 
1 files changed, 8 insertions, 1 deletions
| diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp index 6bbd27478c..2d972ea3f5 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); | 
