diff options
| author | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2025-03-06 12:29:59 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-06 12:29:59 -0500 |
| commit | 2f031e03d659eb0f1110d5ccec936767428eb3f5 (patch) | |
| tree | 4e61fdce618ca87066d8ff606c396ddc3902e80d /indra/newview/llfloaterregioninfo.cpp | |
| parent | 616547993a6ad3135987d75eca9f753438984985 (diff) | |
| parent | 2dfa996db79fe1ceeea7fa33d96642e24b06aa65 (diff) | |
Merge pull request #3657 from secondlife/maxim/2025.03-develop-fixes
Cherry-picking develop fixes 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 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); |