From 8861264d8d3f4c9e8fa5f62ec57f73b0b2fd2ff0 Mon Sep 17 00:00:00 2001 From: Cosmic Linden Date: Wed, 12 Jun 2024 15:33:45 -0700 Subject: secondlife/viewer#1475: Fix Terrain tab controls no longer disabled when insufficient permissions --- indra/newview/llfloaterregioninfo.cpp | 8 ++++---- indra/newview/llviewerregion.cpp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp index 073cef3d73..931b2bd695 100644 --- a/indra/newview/llfloaterregioninfo.cpp +++ b/indra/newview/llfloaterregioninfo.cpp @@ -356,7 +356,7 @@ void LLFloaterRegionInfo::requestRegionInfo() { tab->getChild("General")->setCtrlsEnabled(false); tab->getChild("Debug")->setCtrlsEnabled(false); - tab->getChild("Terrain")->setCtrlsEnabled(false); + tab->getChild("Terrain")->setAllChildrenEnabled(false, true); tab->getChild("Estate")->setCtrlsEnabled(false); tab->getChild("Access")->setCtrlsEnabled(false); } @@ -553,7 +553,7 @@ void LLFloaterRegionInfo::processRegionInfo(LLMessageSystem* msg) panel->getChild("terrain_raise_spin")->setValue(region_info.mTerrainRaiseLimit); panel->getChild("terrain_lower_spin")->setValue(region_info.mTerrainLowerLimit); - panel->setCtrlsEnabled(allow_modify); + panel->setAllChildrenEnabled(allow_modify, true); if (floater->getVisible()) { @@ -668,7 +668,7 @@ void LLFloaterRegionInfo::disableTabCtrls() tab->getChild("General")->setCtrlsEnabled(false); tab->getChild("Debug")->setCtrlsEnabled(false); - tab->getChild("Terrain")->setCtrlsEnabled(false); + tab->getChild("Terrain")->setAllChildrenEnabled(false, true); tab->getChild("panel_env_info")->setCtrlsEnabled(false); tab->getChild("Estate")->setCtrlsEnabled(false); tab->getChild("Access")->setCtrlsEnabled(false); @@ -1657,7 +1657,7 @@ bool LLPanelRegionTerrainInfo::refreshFromRegion(LLViewerRegion* region) || (region && (region->getOwner() == gAgent.getID())); bool owner_or_god_or_manager = owner_or_god || (region && region->isEstateManager()); - setCtrlsEnabled(owner_or_god_or_manager); + setAllChildrenEnabled(owner_or_god_or_manager, true); getChildView("apply_btn")->setEnabled(false); diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index c75d590df8..e8a9f41855 100755 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -2495,11 +2495,11 @@ void LLViewerRegion::setSimulatorFeatures(const LLSD& sim_features) if (features.has("PBRTerrainTransformsEnabled")) { bool enabled = features["PBRTerrainTransformsEnabled"]; - gSavedSettings.setBOOL("RenderTerrainTransformsPBREnabled", enabled); + gSavedSettings.setBOOL("RenderTerrainPBRTransformsEnabled", enabled); } else { - gSavedSettings.setBOOL("RenderTerrainTransformsPBREnabled", false); + gSavedSettings.setBOOL("RenderTerrainPBRTransformsEnabled", false); } }; -- cgit v1.2.3