summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2019-04-18 18:49:10 +0000
committerRider Linden <rider@lindenlab.com>2019-04-18 18:49:10 +0000
commit665caabbabd6f99164cbdc4aa7b5301bff300414 (patch)
tree7d62f5edd8d0b8f525434a71c49f74e4a3451202 /indra/newview
parent79dc5424d3ef3bdec62bdb7b937b4b69c7a4f1b3 (diff)
parent1a9f9ae089111d9aa23dab97c02fb9fdb55f4865 (diff)
Merged in graham_linden/viewer-eep-rc-fixes (pull request #359)
Fix merge error from 6.2.1 EAM merge.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llfloaterregioninfo.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp
index bb76af9a3c..ab91c34b3d 100644
--- a/indra/newview/llfloaterregioninfo.cpp
+++ b/indra/newview/llfloaterregioninfo.cpp
@@ -350,6 +350,7 @@ void LLFloaterRegionInfo::requestRegionInfo()
tab->getChild<LLPanel>("Debug")->setCtrlsEnabled(FALSE);
tab->getChild<LLPanel>("Terrain")->setCtrlsEnabled(FALSE);
tab->getChild<LLPanel>("Estate")->setCtrlsEnabled(FALSE);
+ tab->getChild<LLPanel>("Access")->setCtrlsEnabled(FALSE);
}
// Must allow anyone to request the RegionInfo data