diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-08-16 16:27:53 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-08-16 16:27:53 -0700 |
| commit | 7f25bef9c4bd5bf277331040711f13eb69b9c6d1 (patch) | |
| tree | cce3b8f787c97d519793c66988907626e91129e3 /indra/newview/llenvironment.cpp | |
| parent | 6b70b8bcdad045c2bded34478d27d048ef558534 (diff) | |
MAINT-7703: Estate level switch turns of parcel environments.
Diffstat (limited to 'indra/newview/llenvironment.cpp')
| -rw-r--r-- | indra/newview/llenvironment.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llenvironment.cpp b/indra/newview/llenvironment.cpp index 98fe593aeb..f33e5b864a 100644 --- a/indra/newview/llenvironment.cpp +++ b/indra/newview/llenvironment.cpp @@ -59,6 +59,7 @@ #include "llatmosphere.h" #include "llagent.h" #include "roles_constants.h" +#include "llestateinfomodel.h" //========================================================================= namespace @@ -395,6 +396,9 @@ bool LLEnvironment::canAgentUpdateParcelEnvironment(LLParcel *parcel) const if (gAgent.isGodlike()) return true; + if (!LLEstateInfoModel::instance().getAllowEnvironmentOverride()) + return false; + return LLViewerParcelMgr::isParcelModifiableByAgent(parcel, GP_LAND_OPTIONS); } |