diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-08-17 12:35:42 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-08-17 12:35:42 -0700 |
| commit | 1716129fd23ff35e030808406af1a8f796dc4b01 (patch) | |
| tree | 6b4c71557920032781b9ae6cf19b89acf15f89c3 /indra/newview/llenvironment.cpp | |
| parent | 7f25bef9c4bd5bf277331040711f13eb69b9c6d1 (diff) | |
MAINT-8826, MAINT-8990, MAINT-9002, MAINT-7703: Rework for environment pannels in Region/Estate and Parcel. Enable/disable by permission. Edit the correct environment. Dirty flags for changes. Estate owner disallow switch.
Diffstat (limited to 'indra/newview/llenvironment.cpp')
| -rw-r--r-- | indra/newview/llenvironment.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llenvironment.cpp b/indra/newview/llenvironment.cpp index f33e5b864a..60e5b81f15 100644 --- a/indra/newview/llenvironment.cpp +++ b/indra/newview/llenvironment.cpp @@ -396,7 +396,7 @@ bool LLEnvironment::canAgentUpdateParcelEnvironment(LLParcel *parcel) const if (gAgent.isGodlike()) return true; - if (!LLEstateInfoModel::instance().getAllowEnvironmentOverride()) + if (!parcel->getRegionAllowEnvironmentOverride()) return false; return LLViewerParcelMgr::isParcelModifiableByAgent(parcel, GP_LAND_OPTIONS); |