From 1716129fd23ff35e030808406af1a8f796dc4b01 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Fri, 17 Aug 2018 12:35:42 -0700
Subject: 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.

---
 indra/newview/llenvironment.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/llenvironment.cpp')

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);
-- 
cgit v1.3