diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-10-01 17:17:29 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-10-01 17:17:29 +0100 |
| commit | c4941fc182585769e8e3151f98127c9b8c3221f2 (patch) | |
| tree | 84e347ae2573ce5b538f124a0ce95f3a50fc69c7 /indra/newview/llfloaterfixedenvironment.cpp | |
| parent | ae099c639fe45a13454d50526b1c8610ee98ea83 (diff) | |
| parent | ee2720d0a1d9153547a6012d6b31c6bfff4e37a7 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llfloaterfixedenvironment.cpp')
| -rw-r--r-- | indra/newview/llfloaterfixedenvironment.cpp | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/indra/newview/llfloaterfixedenvironment.cpp b/indra/newview/llfloaterfixedenvironment.cpp index b9ea044a06..71d3ef6405 100644 --- a/indra/newview/llfloaterfixedenvironment.cpp +++ b/indra/newview/llfloaterfixedenvironment.cpp @@ -571,19 +571,7 @@ bool LLFloaterFixedEnvironment::canApplyRegion() const bool LLFloaterFixedEnvironment::canApplyParcel() const { - LLParcelSelectionHandle handle(LLViewerParcelMgr::instance().getParcelSelection()); - LLParcel *parcel(nullptr); - - if (handle) - parcel = handle->getParcel(); - if (!parcel) - parcel = LLViewerParcelMgr::instance().getAgentParcel(); - - if (!parcel) - return false; - - return parcel->allowModifyBy(gAgent.getID(), gAgent.getGroupID()) && - LLEnvironment::instance().isExtendedEnvironmentEnabled(); + return LLEnvironment::instance().canAgentUpdateParcelEnvironment(); } //========================================================================= |